Skip to content

Commit 02b9f26

Browse files
anderssonrobclark
authored andcommitted
drm/msm/gpu: Drop qos request if devm_devfreq_add_device() fails
In the event that devm_devfreq_add_device() fails the device's qos freq list is left referencing df->idle_freq and df->boost_freq. Attempting to initialize devfreq again after a probe deferral will then cause invalid memory accesses in dev_pm_qos_add_request(). Fix this by dropping the requests in the error path. Fixes: 7c0ffcd ("drm/msm/gpu: Respect PM QoS constraints") Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Reviewed-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/493001/ Link: https://lore.kernel.org/r/20220708162632.3529864-1-bjorn.andersson@linaro.org Signed-off-by: Rob Clark <robdclark@chromium.org>
1 parent a1653a7 commit 02b9f26

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/gpu/drm/msm/msm_gpu_devfreq.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ void msm_devfreq_init(struct msm_gpu *gpu)
213213

214214
if (IS_ERR(df->devfreq)) {
215215
DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize GPU devfreq\n");
216+
dev_pm_qos_remove_request(&df->idle_freq);
217+
dev_pm_qos_remove_request(&df->boost_freq);
216218
df->devfreq = NULL;
217219
return;
218220
}

0 commit comments

Comments
 (0)