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

Commit eeefa889 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove redundant HAS_PSR checks 



We only need to check for this in psr_enable, everything else is
already protect by the dev_priv->psr.enabled checks. Those need the
psr locking, but these functions are called infrequent enough that the
locking overhead is negligible.

Suggested by Chris Wilson.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fa128fa6

drivers/gpu/drm/i915/intel_dp.c

+0 −14
Original line number Diff line number Diff line
@@ -1772,11 +1772,6 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp) 


	dev_priv->psr.source_ok = false;



	if (!HAS_PSR(dev)) {

		DRM_DEBUG_KMS("PSR not supported on this platform\n");

		return false;

	}



	if (IS_HASWELL(dev) && dig_port->port != PORT_A) {

		DRM_DEBUG_KMS("HSW ties PSR to DDI A (eDP)\n");

		return false;
@@ -1863,9 +1858,6 @@ void intel_edp_psr_disable(struct intel_dp *intel_dp) 
	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (!HAS_PSR(dev))

		return;



	mutex_lock(&dev_priv->psr.lock);

	if (!dev_priv->psr.enabled) {

		mutex_unlock(&dev_priv->psr.lock);
@@ -1940,9 +1932,6 @@ void intel_edp_psr_invalidate(struct drm_device *dev, 
	struct drm_crtc *crtc;

	enum pipe pipe;



	if (!HAS_PSR(dev))

		return;



	mutex_lock(&dev_priv->psr.lock);

	if (!dev_priv->psr.enabled) {

		mutex_unlock(&dev_priv->psr.lock);
@@ -1967,9 +1956,6 @@ void intel_edp_psr_flush(struct drm_device *dev, 
	struct drm_crtc *crtc;

	enum pipe pipe;



	if (!HAS_PSR(dev))

		return;



	mutex_lock(&dev_priv->psr.lock);

	if (!dev_priv->psr.enabled) {

		mutex_unlock(&dev_priv->psr.lock);