From 2c59031a195a36bb2986a8fce35ca2f9ce242eff Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Wed, 21 Sep 2016 15:04:31 +0530 Subject: gpu: nvgpu: init mclk before pstate pmu support JIRA DNVGPU-122 Change-Id: I8491dc0b534c99d43057de1b35d8cdacde93f658 Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1224366 Reviewed-on: http://git-master/r/1245118 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers') 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) goto done; } + if (g->ops.pmu.mclk_init) { + err = g->ops.pmu.mclk_init(g); + if (err) { + gk20a_err(dev, "failed to set mclk"); + /* Indicate error dont goto done */ + } + } + #ifdef CONFIG_ARCH_TEGRA_18x_SOC if (g->ops.pmupstate) { err = gk20a_init_pstate_pmu_support(g); @@ -998,14 +1006,6 @@ int gk20a_pm_finalize_poweron(struct device *dev) } #endif - if (g->ops.pmu.mclk_init) { - err = g->ops.pmu.mclk_init(g); - if (err) { - gk20a_err(dev, "failed to set mclk"); - /* Indicate error dont goto done */ - } - } - err = gk20a_init_therm_support(g); if (err) { gk20a_err(dev, "failed to init gk20a therm"); -- cgit v1.2.2