Commit ad783ff5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-fixes-2022-01-13' of... 

Merge tag 'drm-misc-next-fixes-2022-01-13' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

 * Fix use of CRTC state's active vs enable in atomic helper

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Yd/i/zj9vEHisSSB@linux-uq9g
parents 8f18a987 69e63001

drivers/gpu/drm/drm_atomic_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ crtc_needs_disable(struct drm_crtc_state *old_state, 
	 * it's in self refresh mode and needs to be fully disabled.

	 */

	return old_state->active ||

	       (old_state->self_refresh_active && !new_state->enable) ||

	       (old_state->self_refresh_active && !new_state->active) ||

	       new_state->self_refresh_active;

}