Skip to content

Commit

Permalink
drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled
Browse files Browse the repository at this point in the history
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 <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231121054324.9988-3-ville.syrjala@linux.intel.com
(cherry picked from commit e0d5ce1)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
vsyrjala authored and jnikula committed Nov 29, 2023
1 parent f76f83a commit d21a396
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/display/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -6853,10 +6853,11 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
if (!intel_crtc_needs_modeset(new_crtc_state))
continue;

intel_pre_plane_update(state, crtc);

if (!old_crtc_state->hw.active)
continue;

intel_pre_plane_update(state, crtc);
intel_crtc_disable_planes(state, crtc);
}

Expand Down

0 comments on commit d21a396

Please sign in to comment.