Commit 33924328 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-12-01-1' of... 

Merge tag 'drm-intel-fixes-2023-12-01-1' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v6.7-rc4 #2:
- d21a3962 ("drm/i915: Call intel_pre_plane_updates() also for pipes
  getting enabled") in the previous fixes pull depends on a change that
  wasn't included. Pick it up.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87fs0m48ol.fsf@intel.com
parents 33cc938e 96d7e794

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

+12 −0
Original line number Diff line number Diff line
@@ -906,12 +906,18 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state) 
static bool planes_enabling(const struct intel_crtc_state *old_crtc_state,

			    const struct intel_crtc_state *new_crtc_state)

{

	if (!new_crtc_state->hw.active)

		return false;



	return is_enabling(active_planes, old_crtc_state, new_crtc_state);

}



static bool planes_disabling(const struct intel_crtc_state *old_crtc_state,

			     const struct intel_crtc_state *new_crtc_state)

{

	if (!old_crtc_state->hw.active)

		return false;



	return is_disabling(active_planes, old_crtc_state, new_crtc_state);

}
@@ -928,6 +934,9 @@ static bool vrr_params_changed(const struct intel_crtc_state *old_crtc_state, 
static bool vrr_enabling(const struct intel_crtc_state *old_crtc_state,

			 const struct intel_crtc_state *new_crtc_state)

{

	if (!new_crtc_state->hw.active)

		return false;



	return is_enabling(vrr.enable, old_crtc_state, new_crtc_state) ||

		(new_crtc_state->vrr.enable &&

		 (new_crtc_state->update_m_n || new_crtc_state->update_lrr ||
@@ -937,6 +946,9 @@ static bool vrr_enabling(const struct intel_crtc_state *old_crtc_state, 
static bool vrr_disabling(const struct intel_crtc_state *old_crtc_state,

			  const struct intel_crtc_state *new_crtc_state)

{

	if (!old_crtc_state->hw.active)

		return false;



	return is_disabling(vrr.enable, old_crtc_state, new_crtc_state) ||

		(old_crtc_state->vrr.enable &&

		 (new_crtc_state->update_m_n || new_crtc_state->update_lrr ||