Merge pull request #31 from Florin9doi/p5

Nvidia device names
This commit is contained in:
Sergey 2019-11-15 19:21:06 +03:00 committed by GitHub
commit c5bf8f941c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 54 additions and 40 deletions

View File

@ -101,6 +101,7 @@ HDA_CONTROLLER_LIST_ENTRY gHdaControllerList[] = {
{ HDA_CONTROLLER_GP104, L"NVIDIA GP104 HD Audio Controller" },
{ HDA_CONTROLLER_GP106, L"NVIDIA GP106 HD Audio Controller" },
{ HDA_CONTROLLER_TU102, L"NVIDIA TU102 HD Audio Controller" },
{ HDA_CONTROLLER_TU106, L"NVIDIA TU106 HD Audio Controller" },
{ HDA_CONTROLLER_NVIDIAXXXX, L"NVIDIA HD Audio Controller" },
// End.

View File

@ -196,6 +196,7 @@
#define HDA_CONTROLLER_GP104 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x10F0)
#define HDA_CONTROLLER_GP106 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x10F1)
#define HDA_CONTROLLER_TU102 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x10F7)
#define HDA_CONTROLLER_TU106 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x10F9)
#define HDA_CONTROLLER_NVIDIAXXXX HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0xFFFF)
#define HDA_NVIDIA_MCP51 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x026c)
@ -216,27 +217,29 @@
#define HDA_NVIDIA_MCP79_2 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0ac1)
#define HDA_NVIDIA_MCP79_3 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0ac2)
#define HDA_NVIDIA_MCP79_4 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0ac3)
#define HDA_NVIDIA_0BE2 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be2)
#define HDA_NVIDIA_0BE3 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be3) // [GeForce 210] HDAcodec
#define HDA_NVIDIA_0BE4 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be4) // [GeForge GT 240] HDACodec 10de000d (0d00de10)
#define HDA_NVIDIA_GT100 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be5) // [GeForge GTX 470] HDACodec 10de0010 (1000de10)
#define HDA_NVIDIA_GT106 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be9)
#define HDA_NVIDIA_GT108 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0bea) // HDACodec
#define HDA_NVIDIA_GT104 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0beb)
#define HDA_NVIDIA_GT116 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0bee)
#define HDA_NVIDIA_GT216 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be2)
#define HDA_NVIDIA_GT218 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be3) // [GeForce 210] HDAcodec
#define HDA_NVIDIA_GT215 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be4) // [GeForge GT 240] HDACodec 10de000d (0d00de10)
#define HDA_NVIDIA_GF100 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be5) // [GeForge GTX 470] HDACodec 10de0010 (1000de10)
#define HDA_NVIDIA_GF106 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0be9)
#define HDA_NVIDIA_GF108 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0bea) // HDACodec
#define HDA_NVIDIA_GF104 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0beb)
#define HDA_NVIDIA_GF116 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0bee)
#define HDA_NVIDIA_MCP89_1 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0d94)
#define HDA_NVIDIA_MCP89_2 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0d95)
#define HDA_NVIDIA_MCP89_3 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0d96)
#define HDA_NVIDIA_MCP89_4 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0d97)
#define HDA_NVIDIA_GF119 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e08)
#define HDA_NVIDIA_GF110_1 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e09)
#define HDA_NVIDIA_GF110_2 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e0c) // HDACodec de101600 (10de0016), Controller Binary de100c0e x2
#define HDA_NVIDIA_GF110 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e09)
#define HDA_NVIDIA_GK104 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e0a)
#define HDA_NVIDIA_GK106 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e0b)
#define HDA_NVIDIA_GF114 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e0c) // HDACodec de101600 (10de0016), Controller Binary de100c0e x2
#define HDA_NVIDIA_GK208 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e0f)
#define HDA_NVIDIA_GK110 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e1a)
#define HDA_NVIDIA_GK107 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0e1b) // HDACodec de104200 (10de0042)
#define HDA_NVIDIA_GP104_2 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x10f0) // GeForce GTX 1070
#define HDA_NVIDIA_GM204_2 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0fbb) // GeForce GTX 970
#define HDA_NVIDIA_GM204 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x0fbb) // GeForce GTX 970
#define HDA_NVIDIA_GP104 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x10f0) // GeForce GTX 1070
#define HDA_NVIDIA_TU106 HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0x10f9)
#define HDA_NVIDIA_ALL HDA_CONTROLLER_CONSTRUCT(NVIDIA, 0xffff)
/* ATI */

View File

@ -7087,7 +7087,7 @@ GetDevices ()
gfx->Mmio = (UINT8*)(UINTN)(Bar0 & ~0x0f);
//DBG ("BAR: 0x%p\n", Mmio);
// get card type
gfx->Family = (REG32(gfx->Mmio, 0) >> 20) & 0x3ff;
gfx->Family = (REG32(gfx->Mmio, 0) >> 20) & 0x1ff;
UFamily = gfx->Family & 0x1F0;
if ((UFamily == NV_ARCH_KEPLER1) ||
(UFamily == NV_ARCH_KEPLER2) ||
@ -7102,9 +7102,15 @@ GetDevices ()
(UFamily == NV_ARCH_MAXWELL2)) {
CardFamily = "Maxwell";
}
else if (UFamily == NV_ARCH_PASCAL){
else if (UFamily == NV_ARCH_PASCAL) {
CardFamily = "Pascal";
}
else if (UFamily == NV_ARCH_VOLTA) {
CardFamily = "Volta";
}
else if (UFamily == NV_ARCH_TURING) {
CardFamily = "Turing";
}
else if ((UFamily >= NV_ARCH_TESLA) && (UFamily < 0xB0)) { //not sure if 0xB0 is Tesla or Fermi
CardFamily = "Tesla";
} else {

View File

@ -111,23 +111,25 @@ static hda_controller_devices know_hda_controller[] = {
{ HDA_NVIDIA_MCP89_2, "MCP89" /*, 0, 0 */ },
{ HDA_NVIDIA_MCP89_3, "MCP89" /*, 0, 0 */ },
{ HDA_NVIDIA_MCP89_4, "MCP89" /*, 0, 0 */ },
{ HDA_NVIDIA_0BE2, "(0x0be2)" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_0BE3, "(0x0be3)" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_0BE4, "(0x0be4)" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT100, "GT100" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT104, "GT104" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT106, "GT106" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT108, "GT108" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT116, "GT116" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT216, "GT216" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT218, "GT218" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GT215, "GT215" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF100, "GF100" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF104, "GF104" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF106, "GF106" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF108, "GF108" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF116, "GF116" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF119, "GF119" /*, 0, 0 */ },
{ HDA_NVIDIA_GF110_1, "GF110" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF110_2, "GF110" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF110, "GF110" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GF114, "GF114" /*, 0, HDAC_QUIRK_MSI */ },
{ HDA_NVIDIA_GK110, "GK110" /*, 0, ? */ },
{ HDA_NVIDIA_GK106, "GK106" /*, 0, ? */ },
{ HDA_NVIDIA_GK107, "GK107" /*, 0, ? */ },
{ HDA_NVIDIA_GK104, "GK104" /*, 0, ? */ },
{ HDA_NVIDIA_GP104_2, "Pascal GP104-200" /*, 0, ? */ },
{ HDA_NVIDIA_GM204_2, "Maxwell GP204-200" /*, 0, ? */ },
{ HDA_NVIDIA_GK208, "GK208" /*, 0, ? */ },
{ HDA_NVIDIA_GP104, "GP104" /*, 0, ? */ },
{ HDA_NVIDIA_GM204, "GM204" /*, 0, ? */ },
{ HDA_NVIDIA_TU106, "TU106" /*, 0, ? */ },
//1002 Advanced Micro Devices [AMD] nee ATI Technologies Inc
{ HDA_ATI_SB450, "SB4x0" /*, 0, 0 */ },
@ -572,13 +574,13 @@ CHAR8 *get_hda_controller_name(UINT16 controller_device_id, UINT16 controller_ve
switch (controller_vendor_id)
{
case VEN_ATI_ID:
name_format = "ATI %a HDA Controller (HDMi)"; break;
name_format = "ATI %a HDA Controller (HDMi/DP)"; break;
case VEN_INTEL_ID:
name_format = "Intel %a HDA Controller"; break;
case VEN_NVIDIA_ID:
name_format = "Nvidia %a HDA Controller (HDMi)"; break;
name_format = "Nvidia %a HDA Controller (HDMi/DP)"; break;
case VEN_RDC_ID:
name_format = "RDC %a HDA Controller"; break;

View File

@ -1434,10 +1434,10 @@ static nvidia_pci_info_t nvidia_card_generic[] = {
// { 0x10DE1C80, "Graphics Device" }, // GP107
{ 0x10DE1C81, "GeForce GTX 1050" }, // GP107
{ 0x10DE1C82, "GeForce GTX 1050 Ti"}, // GP107
// 1D00 - 1EFFF
{ 0x10DE1D01, "GeForce GTX 1030"}, // family 138
{ 0x10DE1D10, "GeForce MX150"},
{ 0x10DE1F06, "GeForce RTX 2060 SUPER" }, // TU106
// 2000 - 1EFFF
};
static nvidia_card_info_t nvidia_card_exceptions[] = {

View File

@ -121,14 +121,16 @@ struct bios {
#define NV_ARCH_30 0x30
#define NV_ARCH_40 0x40
#define NV_ARCH_TESLA 0x50
#define NV_ARCH_FERMI1 0xC0 // Fermi
#define NV_ARCH_FERMI2 0xD0 // Fermi
#define NV_ARCH_KEPLER1 0xE0 // Kepler - GT 6XX/GTX 6XX/GTX 6XX Ti
#define NV_ARCH_KEPLER2 0xF0 // Kepler - Tesla K20X/GTX 780/GTX TITAN/TITAN LE
#define NV_ARCH_KEPLER3 0x100 // Kepler - GT 630.Rev2/635/640.Rev2/710/720/730/740
#define NV_ARCH_MAXWELL1 0x110 // Maxwell - GTX 745/750/750 Ti
#define NV_ARCH_MAXWELL2 0x120 // Maxwell - GTX 9XX/9XX Ti/TITAN X
#define NV_ARCH_PASCAL 0x130 // Pascal - GTX 10XX/10XX Ti/TITAN X/Xp
#define NV_ARCH_FERMI1 0xC0 // Fermi
#define NV_ARCH_FERMI2 0xD0 // Fermi
#define NV_ARCH_KEPLER1 0xE0 // Kepler - GT 6XX/GTX 6XX/GTX 6XX Ti
#define NV_ARCH_KEPLER2 0xF0 // Kepler - Tesla K20X/GTX 780/GTX TITAN/TITAN LE
#define NV_ARCH_KEPLER3 0x100 // Kepler - GT 630.Rev2/635/640.Rev2/710/720/730/740
#define NV_ARCH_MAXWELL1 0x110 // Maxwell - GTX 745/750/750 Ti
#define NV_ARCH_MAXWELL2 0x120 // Maxwell - GTX 9XX/9XX Ti/TITAN X
#define NV_ARCH_PASCAL 0x130 // Pascal - GTX 10XX/10XX Ti/TITAN X/Xp
#define NV_ARCH_VOLTA 0x140 // Volta - Titan V/Quadro GV100
#define NV_ARCH_TURING 0x160 // Turing - GTX 16xx/RTX 20xx
#define CHIPSET_NV03 0x0010

View File

@ -2023,10 +2023,10 @@ RefitMain (IN EFI_HANDLE ImageHandle,
DBG("\n");
if (Now.TimeZone < -1440 || Now.TimeZone > 1440) {
MsgLog("Now is %d.%d.%d, %d:%d:%d (GMT)\n",
MsgLog("Now is %02d.%02d.%d, %02d:%02d:%02d (GMT)\n",
Now.Day, Now.Month, Now.Year, Now.Hour, Now.Minute, Now.Second);
} else {
MsgLog("Now is %d.%d.%d, %d:%d:%d (GMT+%d)\n",
MsgLog("Now is %02d.%02d.%d, %02d:%02d:%02d (GMT+%d)\n",
Now.Day, Now.Month, Now.Year, Now.Hour, Now.Minute, Now.Second, GlobalConfig.Timezone);
}
//MsgLog("Starting Clover rev %s on %s EFI\n", FIRMWARE_REVISION, gST->FirmwareVendor);