drm/i915/skl: Don't check for ULT/ULX when detecting the PCH
authorDamien Lespiau <damien.lespiau@intel.com>
Wed, 1 Oct 2014 19:04:17 +0000 (20:04 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 24 Oct 2014 14:33:58 +0000 (16:33 +0200)
IS_ULT() wasn't taking into account SKL so we had a warn with SPT-LP.

We don't realy need those checks here, and as we don't need to introduce
IS_SKL_ULT/ULX() at the moment, let's just drop them.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c

index 02cee518c113283d742b1e48064b2d619654361a..a05a1d083e95742842365b31c6bf4946c4846ef9 100644 (file)
@@ -479,12 +479,10 @@ void intel_detect_pch(struct drm_device *dev)
                                dev_priv->pch_type = PCH_SPT;
                                DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
                                WARN_ON(!IS_SKYLAKE(dev));
-                               WARN_ON(IS_ULT(dev));
                        } else if (id == INTEL_PCH_SPT_LP_DEVICE_ID_TYPE) {
                                dev_priv->pch_type = PCH_SPT;
                                DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
                                WARN_ON(!IS_SKYLAKE(dev));
-                               WARN_ON(!IS_ULT(dev));
                        } else
                                continue;