drm/i915: PSR VLV/CHV: Remove condition checks that only applies to Haswell.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 12 Jan 2015 18:14:29 +0000 (10:14 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 15 Jan 2015 00:35:48 +0000 (01:35 +0100)
These conditions applies only to Haswell and we were also checking for them
on Valleyview/Cherryview.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Durgadoss R <durgadoss.r@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_psr.c

index afb8b8ce8d9fbd14be0a09ce0fe275b6fadc1ae5..3dd88861f4170622068558f9b78ff1de4198f36a 100644 (file)
@@ -270,22 +270,19 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
                return false;
        }
 
-       /* Below limitations aren't valid for Broadwell */
-       if (IS_BROADWELL(dev))
-               goto out;
-
-       if (I915_READ(HSW_STEREO_3D_CTL(intel_crtc->config.cpu_transcoder)) &
-           S3D_ENABLE) {
+       if (IS_HASWELL(dev) &&
+           I915_READ(HSW_STEREO_3D_CTL(intel_crtc->config.cpu_transcoder)) &
+                     S3D_ENABLE) {
                DRM_DEBUG_KMS("PSR condition failed: Stereo 3D is Enabled\n");
                return false;
        }
 
-       if (intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) {
+       if (IS_HASWELL(dev) &&
+           intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) {
                DRM_DEBUG_KMS("PSR condition failed: Interlaced is Enabled\n");
                return false;
        }
 
- out:
        dev_priv->psr.source_ok = true;
        return true;
 }