drm/msm/dpu: don't use active in atomic_check()

[ Upstream commit 25b4614843bcc56ba150f7c99905125a019e656c ]

The driver isn't supposed to consult crtc_state->active/active_check for
resource allocation. Instead all resources should be allocated if
crtc_state->enabled is set. Stop consulting active / active_changed in
order to determine whether the hardware resources should be
(re)allocated.

Fixes: ccc862b957c6 ("drm/msm/dpu: Fix reservation failures in modeset")
Reported-by: Simona Vetter <simona.vetter@ffwll.ch>
Closes: https://lore.kernel.org/dri-devel/ZtW_S0j5AEr4g0QW@phenom.ffwll.local/
Reviewed-by: Simona Vetter <simona.vetter@ffwll.ch>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/633393/
Link: https://lore.kernel.org/r/20250123-drm-dirty-modeset-v2-1-bbfd3a6cd1a4@linaro.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index db6c57900781d94de7c5ceb956c1664e3cd40c66..ecd595215a6beabcce68c84b9788b48e451d4ca7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -1191,10 +1191,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
 
        DRM_DEBUG_ATOMIC("%s: check\n", dpu_crtc->name);
 
-       /* force a full mode set if active state changed */
-       if (crtc_state->active_changed)
-               crtc_state->mode_changed = true;
-
        if (cstate->num_mixers) {
                rc = _dpu_crtc_check_and_setup_lm_bounds(crtc, crtc_state);
                if (rc)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 2cf8150adf81ff855bf5ab1b72e56076ad1f9e7c..47b514c89ce667ea87275237f05cc95f57039ee0 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -718,12 +718,11 @@ static int dpu_encoder_virt_atomic_check(
                crtc_state->mode_changed = true;
        /*
         * Release and Allocate resources on every modeset
-        * Dont allocate when active is false.
         */
        if (drm_atomic_crtc_needs_modeset(crtc_state)) {
                dpu_rm_release(global_state, drm_enc);
 
-               if (!crtc_state->active_changed || crtc_state->enable)
+               if (crtc_state->enable)
                        ret = dpu_rm_reserve(&dpu_kms->rm, global_state,
                                        drm_enc, crtc_state, topology);
                if (!ret)