diff options
author | Thomas Fleury <tfleury@nvidia.com> | 2018-03-13 01:11:09 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-14 15:22:51 -0400 |
commit | e77ec1a98e6d65eac5b56999af17d51ffca6671f (patch) | |
tree | e485266735ab3b084bb4e28fc791f03bd5c6ed3c /drivers/gpu | |
parent | bf374b779fbb71280fafcefeb3bb3d68f047b304 (diff) |
gpu: nvgpu: init soc vars from nvgpu_probe
Invoke nvgpu_init_soc_vars from common nvgpu_probe
instead of pci specific nvgpu_pci_tegra_probe.
Bug 200392719
Change-Id: Ibb0474f2497234ba2e393790020af89a0266f5df
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1674016
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Bhosale <dbhosale@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/pci.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index 695bb307..62596d49 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c | |||
@@ -221,6 +221,11 @@ int nvgpu_probe(struct gk20a *g, | |||
221 | nvgpu_init_pm_vars(g); | 221 | nvgpu_init_pm_vars(g); |
222 | nvgpu_init_vbios_vars(g); | 222 | nvgpu_init_vbios_vars(g); |
223 | nvgpu_init_ltc_vars(g); | 223 | nvgpu_init_ltc_vars(g); |
224 | err = nvgpu_init_soc_vars(g); | ||
225 | if (err) { | ||
226 | nvgpu_err(g, "init soc vars failed"); | ||
227 | return err; | ||
228 | } | ||
224 | 229 | ||
225 | /* Initialize the platform interface. */ | 230 | /* Initialize the platform interface. */ |
226 | err = platform->probe(dev); | 231 | err = platform->probe(dev); |
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index 922792d7..c57674ee 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c | |||
@@ -45,7 +45,7 @@ | |||
45 | 45 | ||
46 | static int nvgpu_pci_tegra_probe(struct device *dev) | 46 | static int nvgpu_pci_tegra_probe(struct device *dev) |
47 | { | 47 | { |
48 | return nvgpu_init_soc_vars(get_gk20a(dev)); | 48 | return 0; |
49 | } | 49 | } |
50 | 50 | ||
51 | static int nvgpu_pci_tegra_remove(struct device *dev) | 51 | static int nvgpu_pci_tegra_remove(struct device *dev) |