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

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

drm/i915: PSR: Organize PSR enable function 



We don't need to setup everything else if it doesn't match all conditions.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ba80f4d4

drivers/gpu/drm/i915/intel_dp.c

+6 −4
Original line number Diff line number Diff line
@@ -2148,10 +2148,12 @@ void intel_edp_psr_enable(struct intel_dp *intel_dp) 
	mutex_lock(&dev_priv->psr.lock);

	if (dev_priv->psr.enabled) {

		DRM_DEBUG_KMS("PSR already in use\n");

		mutex_unlock(&dev_priv->psr.lock);

		return;

		goto unlock;

	}



	if (!intel_edp_psr_match_conditions(intel_dp))

		goto unlock;



	dev_priv->psr.busy_frontbuffer_bits = 0;



	intel_edp_psr_setup_vsc(intel_dp);
@@ -2160,8 +2162,8 @@ void intel_edp_psr_enable(struct intel_dp *intel_dp) 
	I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP |

		   EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP);



	if (intel_edp_psr_match_conditions(intel_dp))

	dev_priv->psr.enabled = intel_dp;

unlock:

	mutex_unlock(&dev_priv->psr.lock);

}