]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm: Add valid clones check
authorJessica Zhang <quic_jesszhan@quicinc.com>
Tue, 17 Dec 2024 00:43:14 +0000 (16:43 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 May 2025 09:13:47 +0000 (11:13 +0200)
[ Upstream commit 41b4b11da02157c7474caf41d56baae0e941d01a ]

Check that all encoders attached to a given CRTC are valid
possible_clones of each other.

Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241216-concurrent-wb-v4-3-fe220297a7f0@quicinc.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/drm_atomic_helper.c

index 32902f77f00dd8b85f03811e6d6da99b6d538afe..40e4e1b6c9110677c1c4981eeb15dc93966f4cf6 100644 (file)
@@ -574,6 +574,30 @@ mode_valid(struct drm_atomic_state *state)
        return 0;
 }
 
+static int drm_atomic_check_valid_clones(struct drm_atomic_state *state,
+                                        struct drm_crtc *crtc)
+{
+       struct drm_encoder *drm_enc;
+       struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
+                                                                         crtc);
+
+       drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc_state->encoder_mask) {
+               if (!drm_enc->possible_clones) {
+                       DRM_DEBUG("enc%d possible_clones is 0\n", drm_enc->base.id);
+                       continue;
+               }
+
+               if ((crtc_state->encoder_mask & drm_enc->possible_clones) !=
+                   crtc_state->encoder_mask) {
+                       DRM_DEBUG("crtc%d failed valid clone check for mask 0x%x\n",
+                                 crtc->base.id, crtc_state->encoder_mask);
+                       return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
 /**
  * drm_atomic_helper_check_modeset - validate state object for modeset changes
  * @dev: DRM device
@@ -745,6 +769,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
                ret = drm_atomic_add_affected_planes(state, crtc);
                if (ret != 0)
                        return ret;
+
+               ret = drm_atomic_check_valid_clones(state, crtc);
+               if (ret != 0)
+                       return ret;
        }
 
        /*