From 78c3d8b84fb7856c38a0c12612cdc19093b845d4 Mon Sep 17 00:00:00 2001 From: Wei Shun Chang Date: Mon, 12 Nov 2012 18:54:13 -0200 Subject: [PATCH] --- yaml --- r: 345479 b: refs/heads/master c: ae6935ddda178f6d2b327cd9bf09add133315f15 h: refs/heads/master i: 345477: 4f0edcabff947f8ea933033ee61c033c332c9c05 345475: e2ad57a640c63a2d6950ca741c9f6682cfd4a106 345471: 221be98a00de37c0c15d0fd831e869b40daefe59 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eed734557a68..90c325c3b449 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3fef09dda9ebf113a9a861260eff6f223808043 +refs/heads/master: ae6935ddda178f6d2b327cd9bf09add133315f15 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c index f85e8b0ec00f..a3d754dba5a9 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.c +++ b/trunk/drivers/gpu/drm/i915/i915_drv.c @@ -401,6 +401,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist); #define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00 #define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00 #define INTEL_PCH_LPT_DEVICE_ID_TYPE 0x8c00 +#define INTEL_PCH_LPT_LP_DEVICE_ID_TYPE 0x9c00 void intel_detect_pch(struct drm_device *dev) { @@ -440,6 +441,11 @@ void intel_detect_pch(struct drm_device *dev) dev_priv->num_pch_pll = 0; DRM_DEBUG_KMS("Found LynxPoint PCH\n"); WARN_ON(!IS_HASWELL(dev)); + } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) { + dev_priv->pch_type = PCH_LPT; + dev_priv->num_pch_pll = 0; + DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); + WARN_ON(!IS_HASWELL(dev)); } BUG_ON(dev_priv->num_pch_pll > I915_NUM_PLLS); }