diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-04-28 14:48:02 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-13 18:12:49 -0700 |
| commit | 90711d50d0bc3dde0c2bd214abda8cdaf62f7b2e (patch) | |
| tree | 28900c3927b1dc249195e73b0c7b0357ce0f58dd /drivers/gpu/drm/i915/i915_drv.c | |
| parent | c76b615c43a1189c32058ff3ab5634fc3fa97ae5 (diff) | |
| download | kernel_samsung_smdk4412-90711d50d0bc3dde0c2bd214abda8cdaf62f7b2e.zip kernel_samsung_smdk4412-90711d50d0bc3dde0c2bd214abda8cdaf62f7b2e.tar.gz kernel_samsung_smdk4412-90711d50d0bc3dde0c2bd214abda8cdaf62f7b2e.tar.bz2 | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 6 |
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 dc2c1a2..8c4fcbb 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); #endif #define INTEL_PCH_DEVICE_ID_MASK 0xff00 +#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00 #define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00 #define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00 @@ -275,7 +276,10 @@ void intel_detect_pch (struct drm_device *dev) int id; id = pch->device & INTEL_PCH_DEVICE_ID_MASK; - if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) { + if (id == INTEL_PCH_IBX_DEVICE_ID_TYPE) { + dev_priv->pch_type = PCH_IBX; + DRM_DEBUG_KMS("Found Ibex Peak PCH\n"); + } else if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) { dev_priv->pch_type = PCH_CPT; DRM_DEBUG_KMS("Found CougarPoint PCH\n"); } else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) { |