diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/pci.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/pci.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index 4351ba5b..31181808 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/platform_gk20a.h" | 26 | #include "gk20a/platform_gk20a.h" |
27 | #include "clk/clk.h" | 27 | #include "clk/clk.h" |
28 | #include "clk/clk_mclk.h" | ||
28 | #include "module.h" | 29 | #include "module.h" |
29 | #include "intr.h" | 30 | #include "intr.h" |
30 | 31 | ||
@@ -92,6 +93,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { | |||
92 | .ina3221_dcb_index = 0, | 93 | .ina3221_dcb_index = 0, |
93 | .ina3221_i2c_address = 0x84, | 94 | .ina3221_i2c_address = 0x84, |
94 | .ina3221_i2c_port = 0x2, | 95 | .ina3221_i2c_port = 0x2, |
96 | .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418, | ||
95 | }, | 97 | }, |
96 | { /* DEVICE=0x1c36 */ | 98 | { /* DEVICE=0x1c36 */ |
97 | /* ptimer src frequency in hz */ | 99 | /* ptimer src frequency in hz */ |
@@ -127,6 +129,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { | |||
127 | .ina3221_dcb_index = 0, | 129 | .ina3221_dcb_index = 0, |
128 | .ina3221_i2c_address = 0x84, | 130 | .ina3221_i2c_address = 0x84, |
129 | .ina3221_i2c_port = 0x2, | 131 | .ina3221_i2c_port = 0x2, |
132 | .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418, | ||
130 | }, | 133 | }, |
131 | { /* DEVICE=0x1c37 */ | 134 | { /* DEVICE=0x1c37 */ |
132 | /* ptimer src frequency in hz */ | 135 | /* ptimer src frequency in hz */ |
@@ -162,6 +165,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { | |||
162 | .ina3221_dcb_index = 0, | 165 | .ina3221_dcb_index = 0, |
163 | .ina3221_i2c_address = 0x84, | 166 | .ina3221_i2c_address = 0x84, |
164 | .ina3221_i2c_port = 0x2, | 167 | .ina3221_i2c_port = 0x2, |
168 | .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG418, | ||
165 | }, | 169 | }, |
166 | { /* DEVICE=0x1c75 */ | 170 | { /* DEVICE=0x1c75 */ |
167 | /* ptimer src frequency in hz */ | 171 | /* ptimer src frequency in hz */ |
@@ -197,6 +201,7 @@ static struct gk20a_platform nvgpu_pci_device[] = { | |||
197 | .ina3221_dcb_index = 1, | 201 | .ina3221_dcb_index = 1, |
198 | .ina3221_i2c_address = 0x80, | 202 | .ina3221_i2c_address = 0x80, |
199 | .ina3221_i2c_port = 0x1, | 203 | .ina3221_i2c_port = 0x1, |
204 | .mem_config_idx = GP106_MEM_CONFIG_GDDR5_PG419, | ||
200 | } | 205 | } |
201 | }; | 206 | }; |
202 | 207 | ||
@@ -392,6 +397,8 @@ static int nvgpu_pci_probe(struct pci_dev *pdev, | |||
392 | g->msi_enabled = true; | 397 | g->msi_enabled = true; |
393 | #endif | 398 | #endif |
394 | 399 | ||
400 | g->mem_config_idx = platform->mem_config_idx; | ||
401 | |||
395 | g->irq_stall = pdev->irq; | 402 | g->irq_stall = pdev->irq; |
396 | g->irq_nonstall = pdev->irq; | 403 | g->irq_nonstall = pdev->irq; |
397 | if (g->irq_stall < 0) | 404 | if (g->irq_stall < 0) |