drm/atomic: Remove WARN_ON for invalid plane configuration.

Userspace can set a FB_ID on a plane without setting CRTC_ID, which
will fail with -EINVAL, but the kernel shouldn't warn about that.

Same for !FB_ID and CRTC_ID being set.

Signed-off-by: Maarten Lankhorst <[email protected]>
Acked-by: Daniel Vetter <[email protected]>
Cc: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Harry Wentland <[email protected]>

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 51a848c553b93fc7a88dfe07c6f07ef46f4abacd..7d9ad20040a18480c71a03a906b9ed9b2bd472bd 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -863,10 +863,10 @@ static int drm_atomic_plane_check(struct drm_plane *plane,
        int ret;
 
        /* either *both* CRTC and FB must be set, or neither */
-       if (WARN_ON(state->crtc && !state->fb)) {
+       if (state->crtc && !state->fb) {
                DRM_DEBUG_ATOMIC("CRTC set but no FB\n");
                return -EINVAL;
-       } else if (WARN_ON(state->fb && !state->crtc)) {
+       } else if (state->fb && !state->crtc) {
                DRM_DEBUG_ATOMIC("FB set but no CRTC\n");
                return -EINVAL;
        }