Commit ad444123 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

Revert "drm/i915/display: Ensure PSR gets disabled if no encoders in new state" 



This patches fixes a issue but not in the right way as
for_each_oldnew_intel_crtc_in_state() will interate over all CRTCs
not only the crtc passed as parameter, also this two for_each loops
are not necessary and only make code harder to understand.

Proper fix will be discussed in the next patch.

This reverts commit 75f66490.

Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220714150755.154985-1-jose.souza@intel.com
parent c1949189

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

+22 −31
Original line number Diff line number Diff line
@@ -1863,20 +1863,15 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, 
				struct intel_crtc *crtc)

{

	struct drm_i915_private *i915 = to_i915(state->base.dev);

	struct intel_crtc_state *new_crtc_state, *old_crtc_state;

	int i;

	const struct intel_crtc_state *crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);

	struct intel_encoder *encoder;



	if (!HAS_PSR(i915))

		return;



	for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,

					    new_crtc_state, i) {

		struct intel_encoder *encoder;

		u32 old_new_encoder_mask = old_crtc_state->uapi.encoder_mask |

			new_crtc_state->uapi.encoder_mask;



	for_each_intel_encoder_mask_with_psr(state->base.dev, encoder,

						     old_new_encoder_mask) {

					     crtc_state->uapi.encoder_mask) {

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

		struct intel_psr *psr = &intel_dp->psr;

		bool needs_to_disable = false;
@@ -1888,14 +1883,11 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, 
		 * - PSR disabled in new state

		 * - All planes will go inactive

		 * - Changing between PSR versions

			 * - Encoder isn't present in new mask

		 */

			needs_to_disable |= intel_crtc_needs_modeset(new_crtc_state);

			needs_to_disable |= !new_crtc_state->has_psr;

			needs_to_disable |= !new_crtc_state->active_planes;

			needs_to_disable |= new_crtc_state->has_psr2 != psr->psr2_enabled;

			needs_to_disable |= !(new_crtc_state->uapi.encoder_mask &

					      drm_encoder_mask(&(encoder)->base));

		needs_to_disable |= intel_crtc_needs_modeset(crtc_state);

		needs_to_disable |= !crtc_state->has_psr;

		needs_to_disable |= !crtc_state->active_planes;

		needs_to_disable |= crtc_state->has_psr2 != psr->psr2_enabled;



		if (psr->enabled && needs_to_disable)

			intel_psr_disable_locked(intel_dp);
@@ -1903,7 +1895,6 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, 
		mutex_unlock(&psr->lock);

	}

}

}



static void _intel_psr_post_plane_update(const struct intel_atomic_state *state,

					 const struct intel_crtc_state *crtc_state)