From: Thomas Zimmermann Date: Wed, 26 Jan 2022 08:40:24 +0000 (+0100) Subject: Merge drm/drm-fixes into drm-misc-fixes X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=48ee4835b73c48590d05a54730dc8037ebd39d3b;p=linux.git Merge drm/drm-fixes into drm-misc-fixes Backmerging drm/drm-fixes into drm-misc-fixes for v5.17-rc1. Signed-off-by: Thomas Zimmermann --- 48ee4835b73c48590d05a54730dc8037ebd39d3b diff --cc drivers/gpu/drm/drm_atomic.c index a1e4c7905ebbe,21174efd91bec..88cd992df3560 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@@ -1308,12 -1325,10 +1325,12 @@@ int drm_atomic_check_only(struct drm_at unsigned int affected_crtc = 0; int i, ret = 0; - DRM_DEBUG_ATOMIC("checking %p\n", state); + drm_dbg_atomic(dev, "checking %p\n", state); - for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) - requested_crtc |= drm_crtc_mask(crtc); + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) { + if (new_crtc_state->enable) + requested_crtc |= drm_crtc_mask(crtc); + } for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { ret = drm_atomic_plane_check(old_plane_state, new_plane_state);