Skip to content

Commit d21a396

Browse files
vsyrjalajnikula
authored andcommitted
drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled
We used to call intel_pre_plane_updates() for any pipe going through a modeset whether the pipe was previously enabled or not. This in fact needed to apply all the necessary clock gating workarounds/etc. Restore the correct behaviour. Fixes: 3991999 ("drm/i915: Disable all planes before modesetting any pipes") Reviewed-by: Jani Nikula <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit e0d5ce1) Signed-off-by: Jani Nikula <[email protected]>
1 parent f76f83a commit d21a396

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6853,10 +6853,11 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
68536853
if (!intel_crtc_needs_modeset(new_crtc_state))
68546854
continue;
68556855

6856+
intel_pre_plane_update(state, crtc);
6857+
68566858
if (!old_crtc_state->hw.active)
68576859
continue;
68586860

6859-
intel_pre_plane_update(state, crtc);
68606861
intel_crtc_disable_planes(state, crtc);
68616862
}
68626863

0 commit comments

Comments
 (0)