summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm206
diff options
context:
space:
mode:
authorThomas Fleury <tfleury@nvidia.com>2017-06-07 14:31:54 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-30 11:46:25 -0400
commit125c770c2a9c84d8243d015de4b515f33d45b2d7 (patch)
treef323aa174ca91247357dae071c547bbd65f0538f /drivers/gpu/nvgpu/gm206
parent28093a374bef54b9b68fcb2f00ae7d0529e33a3f (diff)
gpu: nvgpu: determine memory configuration in hal
Remove mem_config_idx from platform data, and instead let HAL determine which memory configuration to use. For this purpose, HAL may use PCI device identifiers, VBIOS version and possibly RAMCFG strap register. Bug 1929155 Change-Id: I9fcd67ff407382839ff81470789043fae1c81283 Reviewed-on: http://git-master/r/1497813 Signed-off-by: Thomas Fleury <tfleury@nvidia.com> (cherry picked from commit 3f722945213bacfc5f6707059b9baccebd92cef1) Reviewed-on: https://git-master/r/1506583 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm206')
-rw-r--r--drivers/gpu/nvgpu/gm206/bios_gm206.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c
index 567b01ce..499fb53f 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c
@@ -315,15 +315,11 @@ int gm206_bios_init(struct gk20a *g)
315 return -EINVAL; 315 return -EINVAL;
316 } 316 }
317 317
318 /* WAR for HW2.5 RevA (identified by VBIOS version) 318 /* WAR for HW2.5 RevA (INA3221 is missing) */
319 * - INA3221 is missing
320 * - use PG418 MCLK switching sequences
321 */
322 if ((g->pci_vendor_id == PCI_VENDOR_ID_NVIDIA) && 319 if ((g->pci_vendor_id == PCI_VENDOR_ID_NVIDIA) &&
323 (g->pci_device_id == 0x1c75) && 320 (g->pci_device_id == 0x1c75) &&
324 (g->gpu_characteristics.vbios_version == 0x86065300)) { 321 (g->gpu_characteristics.vbios_version == 0x86065300)) {
325 g->power_sensor_missing = true; 322 g->power_sensor_missing = true;
326 g->mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418;
327 } 323 }
328 324
329#ifdef CONFIG_DEBUG_FS 325#ifdef CONFIG_DEBUG_FS