mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 18:42:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Properly clear crtc state when disabling it fully, again

Browse Source 
Currently we just leave the old gunk lying around in the crtc
state when userspace asks us to fully disable the crtc. That
doesn't match what the state would be had we never even enabled
the crtc in the first place. So let's make this consistent and
call intel_crtc_prepare_cleared_state() for disabled crtcs as well
(excluding bigjoiner slaves of course which have had their state
copied from the master).

I actually already did this once in commit fff13e63a1 ("drm/i915:
Clear most of crtc state when disabling the crtc") but then
commit 19f65a3dbf ("drm/i915: Try to make bigjoiner work in atomic
check") undid it all :(

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220217103221.10405-5-ville.syrjala@linux.intel.com
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
This commit is contained in:
Ville Syrjälä
2022-02-17 12:32:21 +02:00
parent 7d7007686b
commit d95c25668f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/display/intel_display.c
View File

@@ -7627,9 +7627,8 @@ static int intel_atomic_check(struct drm_device *dev,
continue;
}
if (!new_crtc_state->uapi.enable) {
if (!intel_crtc_is_bigjoiner_slave(new_crtc_state))
intel_crtc_copy_uapi_to_hw_state_modeset(state, crtc);
if (intel_crtc_is_bigjoiner_slave(new_crtc_state)) {
drm_WARN_ON(&dev_priv->drm, new_crtc_state->uapi.enable);
continue;
}
@@ -7637,6 +7636,9 @@ static int intel_atomic_check(struct drm_device *dev,
if (ret)
goto fail;
if (!new_crtc_state->hw.enable)
continue;
ret = intel_modeset_pipe_config(state, new_crtc_state);
if (ret)
goto fail;