]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/i915: Drop useless HAS_PSR() check
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 20 Sep 2017 15:12:36 +0000 (18:12 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 20 Sep 2017 16:54:56 +0000 (19:54 +0300)
It is safe to call intel_psr_disable() on a platform without PSR. We
don't have such a check when calling intel_psr_enable() either.

v2: Don't drop the HAS_DDI check quite yet (Rodrigo)

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170920151236.5864-1-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/intel_dp.c

index 8db6b11f103f25201434106cf29371bd7e73baef..e536f5942d7feef6c12cc6a5a4f26bdc0daf5937 100644 (file)
@@ -2697,7 +2697,7 @@ static void intel_disable_dp(struct intel_encoder *encoder,
        if (old_crtc_state->has_audio)
                intel_audio_codec_disable(encoder);
 
-       if (HAS_PSR(dev_priv) && !HAS_DDI(dev_priv))
+       if (!HAS_DDI(dev_priv))
                intel_psr_disable(intel_dp, old_crtc_state);
 
        /* Make sure the panel is off before trying to change the mode. But also