From: Rodrigo Vivi Date: Wed, 25 Mar 2015 19:18:23 +0000 (-0700) Subject: drm/i915: Remove duplicated psr.active unset X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3cd919fc010043d67259ccf37ca5c5892582051e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git drm/i915: Remove duplicated psr.active unset psr.active is being unset out of the if so this here is useless and duplicated. Signed-off-by: Rodrigo Vivi Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index b9f40c2e0af7..a8f9348259ae 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -532,8 +532,6 @@ static void intel_psr_exit(struct drm_device *dev) WARN_ON(!(val & EDP_PSR_ENABLE)); I915_WRITE(EDP_PSR_CTL(dev), val & ~EDP_PSR_ENABLE); - - dev_priv->psr.active = false; } else { val = I915_READ(VLV_PSRCTL(pipe));