Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16487254 authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter
Browse files

drm/i915: Don't let update_psr function actually enable PSR. 



Being more conservative by enabling PSR only on psr_enable function.

Reviewed-by: default avatarVijay Purushothaman <vijay.a.purushothaman@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4704c573

drivers/gpu/drm/i915/intel_dp.c

+7 −3
Original line number Diff line number Diff line
@@ -1805,9 +1805,6 @@ static void intel_edp_psr_do_enable(struct intel_dp *intel_dp) 
	    intel_edp_is_psr_enabled(dev))

		return;



	/* Setup PSR once */

	intel_edp_psr_setup(intel_dp);



	/* Enable PSR on the panel */

	intel_edp_psr_enable_sink(intel_dp);
@@ -1824,6 +1821,9 @@ void intel_edp_psr_enable(struct intel_dp *intel_dp) 
		return;

	}



	/* Setup PSR once */

	intel_edp_psr_setup(intel_dp);



	if (intel_edp_psr_match_conditions(intel_dp) &&

	    !intel_edp_is_psr_enabled(dev))

		intel_edp_psr_do_enable(intel_dp);
@@ -1848,12 +1848,16 @@ void intel_edp_psr_disable(struct intel_dp *intel_dp) 


void intel_edp_psr_update(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_encoder *encoder;

	struct intel_dp *intel_dp = NULL;



	if (!HAS_PSR(dev))

		return;



	if (!dev_priv->psr.setup_done)

		return;



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head)

		if (encoder->type == INTEL_OUTPUT_EDP) {

			intel_dp = enc_to_intel_dp(&encoder->base);