summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorMahantesh Kumbar <mkumbar@nvidia.com>2016-09-21 05:34:31 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2016-11-01 14:38:37 -0400
commit2c59031a195a36bb2986a8fce35ca2f9ce242eff (patch)
treed5deb6446593830e540da1784df48ac95a57d7f3 /drivers/gpu/nvgpu/gk20a/gk20a.c
parentfabe964c7698527104d80aa006b5c4aca8402f17 (diff)
gpu: nvgpu: init mclk before pstate pmu support
JIRA DNVGPU-122 Change-Id: I8491dc0b534c99d43057de1b35d8cdacde93f658 Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com> Reviewed-on: http://git-master/r/1224366 Reviewed-on: http://git-master/r/1245118 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 87f47cd8..99d2fe63 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -988,6 +988,14 @@ int gk20a_pm_finalize_poweron(struct device *dev)
988 goto done; 988 goto done;
989 } 989 }
990 990
991 if (g->ops.pmu.mclk_init) {
992 err = g->ops.pmu.mclk_init(g);
993 if (err) {
994 gk20a_err(dev, "failed to set mclk");
995 /* Indicate error dont goto done */
996 }
997 }
998
991#ifdef CONFIG_ARCH_TEGRA_18x_SOC 999#ifdef CONFIG_ARCH_TEGRA_18x_SOC
992 if (g->ops.pmupstate) { 1000 if (g->ops.pmupstate) {
993 err = gk20a_init_pstate_pmu_support(g); 1001 err = gk20a_init_pstate_pmu_support(g);
@@ -998,14 +1006,6 @@ int gk20a_pm_finalize_poweron(struct device *dev)
998 } 1006 }
999#endif 1007#endif
1000 1008
1001 if (g->ops.pmu.mclk_init) {
1002 err = g->ops.pmu.mclk_init(g);
1003 if (err) {
1004 gk20a_err(dev, "failed to set mclk");
1005 /* Indicate error dont goto done */
1006 }
1007 }
1008
1009 err = gk20a_init_therm_support(g); 1009 err = gk20a_init_therm_support(g);
1010 if (err) { 1010 if (err) {
1011 gk20a_err(dev, "failed to init gk20a therm"); 1011 gk20a_err(dev, "failed to init gk20a therm");