From 1421a122305dda6365c6cebbe0e13b260edb87ed Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 7 Apr 2022 06:49:11 +0000 Subject: [PATCH] drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode From Liu Ying cd07b19fbf37b96a9885fd6e8545c355dba59ac3 in linux 5.15.y/5.15.27 69e630016ef4e4a1745310c446f204dc6243e907 in mainline linux --- sys/dev/pci/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/drm_atomic_helper.c b/sys/dev/pci/drm/drm_atomic_helper.c index 2c0c6ec9282..ff2bc9a1180 100644 --- a/sys/dev/pci/drm/drm_atomic_helper.c +++ b/sys/dev/pci/drm/drm_atomic_helper.c @@ -1001,7 +1001,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; } -- 2.20.1