aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-04-07 15:33:56 -0400
committerKeith Packard <keithp@keithp.com>2011-05-13 20:11:51 -0400
commitc792513bd1760c364b36391028512fbf2a4eb903 (patch)
tree6b813da015130e28f040ef8f96b21ec0abd817ce /drivers/gpu/drm/i915/i915_drv.c
parent246d08b8f94a5545077611ab5bfb9d47014ede75 (diff)
drm/i915: add PantherPoint PCH ID
We can treat PantherPoint as CougarPoint as far as display goes. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 52e52ce067e1..3930c77ac4ac 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -236,6 +236,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
236 236
237#define INTEL_PCH_DEVICE_ID_MASK 0xff00 237#define INTEL_PCH_DEVICE_ID_MASK 0xff00
238#define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00 238#define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00
239#define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00
239 240
240void intel_detect_pch (struct drm_device *dev) 241void intel_detect_pch (struct drm_device *dev)
241{ 242{
@@ -257,6 +258,10 @@ void intel_detect_pch (struct drm_device *dev)
257 if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) { 258 if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) {
258 dev_priv->pch_type = PCH_CPT; 259 dev_priv->pch_type = PCH_CPT;
259 DRM_DEBUG_KMS("Found CougarPoint PCH\n"); 260 DRM_DEBUG_KMS("Found CougarPoint PCH\n");
261 } else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) {
262 /* PantherPoint is CPT compatible */
263 dev_priv->pch_type = PCH_CPT;
264 DRM_DEBUG_KMS("Found PatherPoint PCH\n");
260 } 265 }
261 } 266 }
262 pci_dev_put(pch); 267 pci_dev_put(pch);