diff options
author | Thomas Fleury <tfleury@nvidia.com> | 2017-06-06 13:59:19 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-21 00:43:48 -0400 |
commit | f78d8c116c06768cf28b0bf0b61589c3ef07ecfb (patch) | |
tree | a1515163c7958a8d2e9f4058f0c2dd69a63bccb1 /drivers/gpu/nvgpu/gm206/bios_gm206.c | |
parent | c32c86342e90cf7d85114f3a40853bc9ba0e7540 (diff) |
gpu: nvgpu: backward support for HW2.5 Rev.A
Add backward support for HW2.5 Rev.A board:
- no INA3221 for voltage, current, and power
- use PG418 MCLK switching sequences
Allow VBIOS from .53 for PG419
Bug 1929155
Change-Id: Ifacfc8cff6d00f66af92305119d0f0d3b9a1e438
Reviewed-on: http://git-master/r/1497001
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
(cherry picked from commit 952778f814916b0b3d5043c43755bfccb467c3d4)
Reviewed-on: http://git-master/r/1497295
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm206/bios_gm206.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm206/bios_gm206.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index 0bc78724..c32959a3 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "gk20a/platform_gk20a.h" | 23 | #include "gk20a/platform_gk20a.h" |
24 | #include "gm20b/fifo_gm20b.h" | 24 | #include "gm20b/fifo_gm20b.h" |
25 | #include "bios_gm206.h" | 25 | #include "bios_gm206.h" |
26 | #include "gp106/pmu_mclk_gp106.h" | ||
26 | 27 | ||
27 | #include <nvgpu/hw/gm206/hw_pwr_gm206.h> | 28 | #include <nvgpu/hw/gm206/hw_pwr_gm206.h> |
28 | #include <nvgpu/hw/gm206/hw_mc_gm206.h> | 29 | #include <nvgpu/hw/gm206/hw_mc_gm206.h> |
@@ -314,11 +315,16 @@ int gm206_bios_init(struct gk20a *g) | |||
314 | return -EINVAL; | 315 | return -EINVAL; |
315 | } | 316 | } |
316 | 317 | ||
317 | /* WAR for missing INA3221 on HW2.5 RevA */ | 318 | /* WAR for HW2.5 RevA (identified by VBIOS version) |
318 | g->power_sensor_missing = | 319 | * - INA3221 is missing |
319 | (g->pci_vendor_id == PCI_VENDOR_ID_NVIDIA) && | 320 | * - use PG418 MCLK switching sequences |
321 | */ | ||
322 | if ((g->pci_vendor_id == PCI_VENDOR_ID_NVIDIA) && | ||
320 | (g->pci_device_id == 0x1c75) && | 323 | (g->pci_device_id == 0x1c75) && |
321 | (g->gpu_characteristics.vbios_version == 0x86065300); | 324 | (g->gpu_characteristics.vbios_version == 0x86065300)) { |
325 | g->power_sensor_missing = true; | ||
326 | g->mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418; | ||
327 | } | ||
322 | 328 | ||
323 | #ifdef CONFIG_DEBUG_FS | 329 | #ifdef CONFIG_DEBUG_FS |
324 | g->bios_blob.data = g->bios.data; | 330 | g->bios_blob.data = g->bios.data; |