drm/msm/devfreq: Restrict idle clamping to a618 for now

Until we better understand the stability issues caused by frequent
frequency changes, lets limit them to a618.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Tested-by: Caleb Connolly <caleb.connolly@linaro.org>
Link: https://lore.kernel.org/r/20211018153627.2787882-1-robdclark@gmail.com
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 33da25b81615a7dcbd9b9ea17ce04e066109d35e..267a880811d654c78ba89de035fd660026afe898 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -1838,6 +1838,13 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)
                        adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), info->rev)))
                adreno_gpu->base.hw_apriv = true;
 
+       /*
+        * For now only clamp to idle freq for devices where this is known not
+        * to cause power supply issues:
+        */
+       if (info && (info->revn == 618))
+               gpu->clamp_to_idle = true;
+
        a6xx_llc_slices_init(pdev, a6xx_gpu);
 
        ret = a6xx_set_supported_hw(&pdev->dev, config->rev);

diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index 030f82f149c2c7a4ad8b29b9c266a5b991d3e0be..ee25d556c8a10c99dfbc0f03fba1c253ffbb0c95 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -203,6 +203,10 @@ struct msm_gpu {
        uint32_t suspend_count;
 
        struct msm_gpu_state *crashstate;
+
+       /* Enable clamping to idle freq when inactive: */
+       bool clamp_to_idle;
+
        /* True if the hardware supports expanded apriv (a650 and newer) */
        bool hw_apriv;
 

diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
index 84e98c07c9001aed6e5ae299885c8a5a6dd047f2..20006d060b5b5564532710a727bfa08caed96818 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c
+++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
@@ -200,7 +200,8 @@ void msm_devfreq_idle(struct msm_gpu *gpu)
 
        idle_freq = get_freq(gpu);
 
-       msm_devfreq_target(&gpu->pdev->dev, &target_freq, 0);
+       if (gpu->clamp_to_idle)
+               msm_devfreq_target(&gpu->pdev->dev, &target_freq, 0);
 
        df->idle_time = ktime_get();
        df->idle_freq = idle_freq;