nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: backward support for HW2.5 Rev.A

Browse Source 
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>
This commit is contained in:
Thomas Fleury
2017-06-06 10:59:19 -07:00
committed by mobile promotions
parent c32c86342e
commit f78d8c116c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/common/linux/pci.c
View File

@@ -197,7 +197,7 @@ static struct gk20a_platform nvgpu_pci_device[] = {
.ch_wdt_timeout_ms = 7000, .ch_wdt_timeout_ms = 7000,
.honors_aperture = true, .honors_aperture = true,
.vbios_min_version = 0x86065600, .vbios_min_version = 0x86065300,
.hardcode_sw_threshold = false, .hardcode_sw_threshold = false,
.ina3221_dcb_index = 1, .ina3221_dcb_index = 1,
.ina3221_i2c_address = 0x80, .ina3221_i2c_address = 0x80,

14
drivers/gpu/nvgpu/gm206/bios_gm206.c
View File

@@ -23,6 +23,7 @@
#include "gk20a/platform_gk20a.h" #include "gk20a/platform_gk20a.h"
#include "gm20b/fifo_gm20b.h" #include "gm20b/fifo_gm20b.h"
#include "bios_gm206.h" #include "bios_gm206.h"
#include "gp106/pmu_mclk_gp106.h"
#include <nvgpu/hw/gm206/hw_pwr_gm206.h> #include <nvgpu/hw/gm206/hw_pwr_gm206.h>
#include <nvgpu/hw/gm206/hw_mc_gm206.h> #include <nvgpu/hw/gm206/hw_mc_gm206.h>
@@ -314,11 +315,16 @@ int gm206_bios_init(struct gk20a *g)
return -EINVAL; return -EINVAL;
} }
/* WAR for missing INA3221 on HW2.5 RevA */ /* WAR for HW2.5 RevA (identified by VBIOS version)
g->power_sensor_missing = * - INA3221 is missing
(g->pci_vendor_id == PCI_VENDOR_ID_NVIDIA) && * - use PG418 MCLK switching sequences
*/
if ((g->pci_vendor_id == PCI_VENDOR_ID_NVIDIA) &&
(g->pci_device_id == 0x1c75) && (g->pci_device_id == 0x1c75) &&
(g->gpu_characteristics.vbios_version == 0x86065300); (g->gpu_characteristics.vbios_version == 0x86065300)) {
g->power_sensor_missing = true;
g->mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418;
}
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
g->bios_blob.data = g->bios.data; g->bios_blob.data = g->bios.data;