aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-04-28 17:48:02 -0400
committerKeith Packard <keithp@keithp.com>2011-05-13 21:12:49 -0400
commit90711d50d0bc3dde0c2bd214abda8cdaf62f7b2e (patch)
tree28900c3927b1dc249195e73b0c7b0357ce0f58dd
parentc76b615c43a1189c32058ff3ab5634fc3fa97ae5 (diff)
drm/i915: set IBX pch type explicitly
This is a little less confusing than relying on the implicit zeroing of the dev_priv. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index dc2c1a294668..8c4fcbb8a4cb 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -255,6 +255,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
255#endif 255#endif
256 256
257#define INTEL_PCH_DEVICE_ID_MASK 0xff00 257#define INTEL_PCH_DEVICE_ID_MASK 0xff00
258#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00
258#define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00 259#define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00
259#define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00 260#define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00
260 261
@@ -275,7 +276,10 @@ void intel_detect_pch (struct drm_device *dev)
275 int id; 276 int id;
276 id = pch->device & INTEL_PCH_DEVICE_ID_MASK; 277 id = pch->device & INTEL_PCH_DEVICE_ID_MASK;
277 278
278 if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) { 279 if (id == INTEL_PCH_IBX_DEVICE_ID_TYPE) {
280 dev_priv->pch_type = PCH_IBX;
281 DRM_DEBUG_KMS("Found Ibex Peak PCH\n");
282 } else if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) {
279 dev_priv->pch_type = PCH_CPT; 283 dev_priv->pch_type = PCH_CPT;
280 DRM_DEBUG_KMS("Found CougarPoint PCH\n"); 284 DRM_DEBUG_KMS("Found CougarPoint PCH\n");
281 } else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) { 285 } else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) {