The ingenic-drm driver has two mutually exclusive primary planes
already; so the fact that a CRTC must have one and only one primary
plane is an invalid assumption.

Fixes: 96962e3de725 ("drm: require each CRTC to have a unique primary plane")
Cc: <sta...@vger.kernel.org> # 5.11
Signed-off-by: Paul Cercueil <p...@crapouillou.net>
---
 drivers/gpu/drm/drm_mode_config.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/gpu/drm/drm_mode_config.c 
b/drivers/gpu/drm/drm_mode_config.c
index 37b4b9f0e468..d86621c41047 100644
--- a/drivers/gpu/drm/drm_mode_config.c
+++ b/drivers/gpu/drm/drm_mode_config.c
@@ -626,9 +626,7 @@ void drm_mode_config_validate(struct drm_device *dev)
 {
        struct drm_encoder *encoder;
        struct drm_crtc *crtc;
-       struct drm_plane *plane;
        u32 primary_with_crtc = 0, cursor_with_crtc = 0;
-       unsigned int num_primary = 0;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return;
@@ -676,13 +674,4 @@ void drm_mode_config_validate(struct drm_device *dev)
                        cursor_with_crtc |= drm_plane_mask(crtc->cursor);
                }
        }
-
-       drm_for_each_plane(plane, dev) {
-               if (plane->type == DRM_PLANE_TYPE_PRIMARY)
-                       num_primary++;
-       }
-
-       WARN(num_primary != dev->mode_config.num_crtc,
-            "Must have as many primary planes as there are CRTCs, but have %u 
primary planes and %u CRTCs",
-            num_primary, dev->mode_config.num_crtc);
 }
-- 
2.30.2

Reply via email to