[Intel-gfx] [PATCH] drm/i915: Don't WARN on BDW when PCH is propperly identified.

Rodrigo Vivi rodrigo.vivi at intel.com
Mon Jan 19 12:13:55 PST 2015


We have BDW that PCH might not be propperly identified and we force it to be LPT.
However when we correctly identify it is LPT we incorrectly WARN that this isn't
a Haswell. For now we have many platforms out there we still need to force
LPT so let's keep the force below, but let's remove the WARN when everything is
propperly identified.

For reference we started receiving logs with this uncessary and incorrect WARN.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972
---
 drivers/gpu/drm/i915/i915_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 308774f..d4ed3a9 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -462,7 +462,7 @@ void intel_detect_pch(struct drm_device *dev)
 			} else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
 				dev_priv->pch_type = PCH_LPT;
 				DRM_DEBUG_KMS("Found LynxPoint PCH\n");
-				WARN_ON(!IS_HASWELL(dev));
+				WARN_ON(!IS_HASWELL(dev) || !IS_BROADWELL(dev));
 				WARN_ON(IS_HSW_ULT(dev));
 			} else if (IS_BROADWELL(dev)) {
 				dev_priv->pch_type = PCH_LPT;
-- 
2.1.0



More information about the Intel-gfx mailing list