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>

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index acb1bb9f..939854e7 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -96,7 +96,6 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .ina3221_dcb_index = 0,
         .ina3221_i2c_address = 0x84,
         .ina3221_i2c_port = 0x2,
-        .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418,
         },
         { /* DEVICE=0x1c36 */
         /* ptimer src frequency in hz */
@@ -132,7 +131,6 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .ina3221_dcb_index = 0,
         .ina3221_i2c_address = 0x84,
         .ina3221_i2c_port = 0x2,
-        .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418,
         },
         { /* DEVICE=0x1c37 */
         /* ptimer src frequency in hz */
@@ -168,7 +166,6 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .ina3221_dcb_index = 0,
         .ina3221_i2c_address = 0x84,
         .ina3221_i2c_port = 0x2,
-        .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418,
         },
         { /* DEVICE=0x1c75 */
         /* ptimer src frequency in hz */
@@ -204,7 +201,6 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .ina3221_dcb_index = 1,
         .ina3221_i2c_address = 0x80,
         .ina3221_i2c_port = 0x1,
-        .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG419,
         }
 };
 
@@ -403,8 +399,6 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
                 g->msi_enabled = true;
 #endif
 
-        g->mem_config_idx = platform->mem_config_idx;
-
         g->irq_stall = pdev->irq;
         g->irq_nonstall = pdev->irq;
         if (g->irq_stall < 0)