Merge drm/drm-fixes into drm-misc-fixes
authorThomas Zimmermann <tzimmermann@suse.de>
Wed, 26 Jan 2022 08:40:24 +0000 (09:40 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Wed, 26 Jan 2022 08:40:24 +0000 (09:40 +0100)
Backmerging drm/drm-fixes into drm-misc-fixes for v5.17-rc1.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
1  2 
drivers/gpu/drm/drm_atomic.c

index a1e4c7905ebbe3d977c9c85bb544619a9d7db481,21174efd91becebe30c2d9cf12d8dc7c68404434..88cd992df35602c979fb72b0f95b47acadd2a854
@@@ -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);