diff options
| author | Rob Clark <robdclark@chromium.org> | 2021-11-20 12:01:02 -0800 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2021-11-21 12:56:51 -0800 |
| commit | 5dbe2711e41818b5474d2119d075d2facc8533dc (patch) | |
| tree | a9c62145b61fc9fc5b89be35275307da130872a2 /drivers/gpu/drm | |
| parent | 26b6f1c870b81ce8a48751a21f363958d2c04cf2 (diff) | |
| download | linux-stable-5dbe2711e41818b5474d2119d075d2facc8533dc.tar.gz linux-stable-5dbe2711e41818b5474d2119d075d2facc8533dc.tar.bz2 linux-stable-5dbe2711e41818b5474d2119d075d2facc8533dc.zip | |
drm/msm/gpu: Fix check for devices without devfreq
Looks like 658f4c829688 ("drm/msm/devfreq: Add 1ms delay before
clamping freq") was badly rebased on top of efb8a170a367 ("drm/msm:
Fix devfreq NULL pointer dereference on a3xx") and ended up with
the NULL check in the wrong place.
Fixes: 658f4c829688 ("drm/msm/devfreq: Add 1ms delay before clamping freq")
Signed-off-by: Rob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20211120200103.1051459-2-robdclark@gmail.com
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu_devfreq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c index 4beb42c31900..384e90c4b2a7 100644 --- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c +++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c @@ -208,9 +208,6 @@ static void msm_devfreq_idle_work(struct kthread_work *work) struct msm_gpu *gpu = container_of(df, struct msm_gpu, devfreq); unsigned long idle_freq, target_freq = 0; - if (!df->devfreq) - return; - /* * Hold devfreq lock to synchronize with get_dev_status()/ * target() callbacks @@ -232,6 +229,9 @@ void msm_devfreq_idle(struct msm_gpu *gpu) { struct msm_gpu_devfreq *df = &gpu->devfreq; + if (!df->devfreq) + return; + msm_hrtimer_queue_work(&df->idle_work, ms_to_ktime(1), HRTIMER_MODE_REL); } |