diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2022-01-14 15:39:50 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2022-01-14 15:39:56 +0300 |
| commit | ad783ff5a20f851c6d9bca03d12d44f98f494af7 (patch) | |
| tree | c5fa3145a79099a7d88eb8d641430fb59fdc3f75 /drivers/gpu | |
| parent | 8f18a987ca761583a09d8e41f9938f61480deca3 (diff) | |
| parent | 69e630016ef4e4a1745310c446f204dc6243e907 (diff) | |
| download | linux-ad783ff5a20f851c6d9bca03d12d44f98f494af7.tar.xz | |
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: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Yd/i/zj9vEHisSSB@linux-uq9g
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index aef2fbd676e5..794442823262 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -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; } |