drm/msm/gpu: fix clk lockup PM suspend/resume handler

gfx3d_clk_src rcg didn't update its configuration.

set clk_enable before set_rate
set "suspend rate" before clk_disable

Signed-off-by: Christoph Rudorff <[email protected]>

Author: Christoph Rudorff

drivers/gpu/drm/msm/msm_gpu.c

@@ -57,31 +57,45 @@ static int disable_pwrrail(struct msm_gpu *gpu)
 
 static int enable_clk(struct msm_gpu *gpu)
 {
+	int ret;
+	ret = clk_bulk_prepare_enable(gpu->nr_clocks, gpu->grp_clks);
+	if (ret)
+		return ret;
+	/*
+	  devfreq_resume_device() can do set_rate
+	  if an "opp-suspend" exists,
+	  I actually see no need ...
+
 	if (gpu->core_clk && gpu->fast_rate)
 		dev_pm_opp_set_rate(&gpu->pdev->dev, gpu->fast_rate);
 
+	*/
+
 	/* Set the RBBM timer rate to 19.2Mhz */
 	if (gpu->rbbmtimer_clk)
 		clk_set_rate(gpu->rbbmtimer_clk, 19200000);
 
-	return clk_bulk_prepare_enable(gpu->nr_clocks, gpu->grp_clks);
+	return 0;
 }
 
 static int disable_clk(struct msm_gpu *gpu)
 {
-	clk_bulk_disable_unprepare(gpu->nr_clocks, gpu->grp_clks);
-
 	/*
 	 * Set the clock to a deliberately low rate. On older targets the clock
 	 * speed had to be non zero to avoid problems. On newer targets this
 	 * will be rounded down to zero anyway so it all works out.
-	 */
+
+	Can declare "opp-suspend" if theres need ...
+
 	if (gpu->core_clk)
-		dev_pm_opp_set_rate(&gpu->pdev->dev, 27000000);
+		dev_pm_opp_set_rate(&gpu->pdev->dev, 1);
+	 */
 
 	if (gpu->rbbmtimer_clk)
 		clk_set_rate(gpu->rbbmtimer_clk, 0);
 
+	clk_bulk_disable_unprepare(gpu->nr_clocks, gpu->grp_clks);
+
 	return 0;
 }
 

drivers/gpu/drm/msm/msm_gpu_devfreq.c

@@ -239,6 +239,7 @@ void msm_devfreq_resume(struct msm_gpu *gpu)
 	mutex_lock(&df->lock);
 	df->busy_cycles = gpu->funcs->gpu_busy(gpu, &sample_rate);
 	df->time = ktime_get();
+	df->idle_freq = 0;
 	df->suspended = false;
 	mutex_unlock(&df->lock);
 
@@ -256,10 +257,10 @@ void msm_devfreq_suspend(struct msm_gpu *gpu)
 	df->suspended = true;
 	mutex_unlock(&df->lock);
 
-	devfreq_suspend_device(df->devfreq);
-
 	cancel_idle_work(df);
 	cancel_boost_work(df);
+
+	devfreq_suspend_device(df->devfreq);
 }
 
 static void msm_devfreq_boost_work(struct kthread_work *work)