aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2012-03-29 11:32:20 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-09 12:03:58 -0400
commiteb877ebfd38b096a60a375785952cc460628d6b2 (patch)
tree918790adad4fea89c12d948858299bcfed2520da /drivers
parent4cae9ae052fe630e63f28be6b0b115fbf52e63fb (diff)
drm/i915: add support for LynxPoint PCH
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c4
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6d7548d1f94b..0efc02e4e7ce 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -351,6 +351,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
351#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00 351#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00
352#define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00 352#define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00
353#define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00 353#define INTEL_PCH_PPT_DEVICE_ID_TYPE 0x1e00
354#define INTEL_PCH_LPT_DEVICE_ID_TYPE 0x8c00
354 355
355void intel_detect_pch(struct drm_device *dev) 356void intel_detect_pch(struct drm_device *dev)
356{ 357{
@@ -379,6 +380,9 @@ void intel_detect_pch(struct drm_device *dev)
379 /* PantherPoint is CPT compatible */ 380 /* PantherPoint is CPT compatible */
380 dev_priv->pch_type = PCH_CPT; 381 dev_priv->pch_type = PCH_CPT;
381 DRM_DEBUG_KMS("Found PatherPoint PCH\n"); 382 DRM_DEBUG_KMS("Found PatherPoint PCH\n");
383 } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
384 dev_priv->pch_type = PCH_LPT;
385 DRM_DEBUG_KMS("Found LynxPoint PCH\n");
382 } 386 }
383 } 387 }
384 pci_dev_put(pch); 388 pci_dev_put(pch);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ffd5d26b6783..d7a5146796e7 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -294,6 +294,7 @@ enum no_fbc_reason {
294enum intel_pch { 294enum intel_pch {
295 PCH_IBX, /* Ibexpeak PCH */ 295 PCH_IBX, /* Ibexpeak PCH */
296 PCH_CPT, /* Cougarpoint PCH */ 296 PCH_CPT, /* Cougarpoint PCH */
297 PCH_LPT, /* Lynxpoint PCH */
297}; 298};
298 299
299#define QUIRK_PIPEA_FORCE (1<<0) 300#define QUIRK_PIPEA_FORCE (1<<0)
@@ -1058,6 +1059,7 @@ struct drm_i915_file_private {
1058#define HAS_PIPE_CONTROL(dev) (INTEL_INFO(dev)->gen >= 5) 1059#define HAS_PIPE_CONTROL(dev) (INTEL_INFO(dev)->gen >= 5)
1059 1060
1060#define INTEL_PCH_TYPE(dev) (((struct drm_i915_private *)(dev)->dev_private)->pch_type) 1061#define INTEL_PCH_TYPE(dev) (((struct drm_i915_private *)(dev)->dev_private)->pch_type)
1062#define HAS_PCH_LPT(dev) (INTEL_PCH_TYPE(dev) == PCH_LPT)
1061#define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT) 1063#define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)
1062#define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX) 1064#define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)
1063 1065