Skip to contentSkip to conversation

drm/i915: add LynxPoint-LP PCH ID

PATCH In review Paulo Zanoni 3 participants 4 messages Nov 12, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: add LynxPoint-LP PCH ID

From: Wei Shun Chang <[email protected]>

[pzanoni: rebase, print it's an LP PCH]

---
 drivers/gpu/drm/i915/i915_drv.c |    6 ++++++
 1 file changed, 6 insertions(+)

I can't test the patch since I don't have the LP PCH.

drivers/gpu/drm/i915/i915_drv.c +6 -0
index f8ba5fe..418d17c 100644
@@ -394,6 +394,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)
 {
@@ -433,6 +434,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);
 		}
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 11 lines · Paulo Zanoni

From: Wei Shun Chang <[email protected]>

[pzanoni: rebase, print it's an LP PCH]

---
 drivers/gpu/drm/i915/i915_drv.c |    6 ++++++
 1 file changed, 6 insertions(+)

I can't test the patch since I don't have the LP PCH.

Including Josh, since he has such a machine.
-Daniel

Quoted 33 lines
drivers/gpu/drm/i915/i915_drv.c +6 -0
index f8ba5fe..418d17c 100644
@@ -394,6 +394,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)
 {
@@ -433,6 +434,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);
 		}
Signature · 6 lines
1.7.10.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Tested-by
#2 lore raw
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Paulo Zanoni

From: Wei Shun Chang <[email protected]>

[pzanoni: rebase, print it's an LP PCH]

---
 drivers/gpu/drm/i915/i915_drv.c |    6 ++++++
 1 file changed, 6 insertions(+)
Quoted 3 lines
Quoted 1 line

I can't test the patch since I don't have the LP PCH.

Including Josh, since he has such a machine.

With this patch, I can boot and run on such a board. I do get an odd kernel gripe, though: "More than 8 outputs detected".

Quoted 36 lines
Quoted 31 lines
drivers/gpu/drm/i915/i915_drv.c +6 -0
index f8ba5fe..418d17c 100644
@@ -394,6 +394,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)
 {
@@ -433,6 +434,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);
 		}
Signature · 6 lines
1.7.10.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#3 lore raw
Quoted 12 lines · Josh Triplett
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Paulo Zanoni

From: Wei Shun Chang <[email protected]>

[pzanoni: rebase, print it's an LP PCH]

---
 drivers/gpu/drm/i915/i915_drv.c |    6 ++++++
 1 file changed, 6 insertions(+)
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

I can't test the patch since I don't have the LP PCH.

Including Josh, since he has such a machine.

Merged, thanks for testing&patch.

Quoted 2 lines

With this patch, I can boot and run on such a board. I do get an odd kernel gripe, though: "More than 8 outputs detected".

That's just our fake opregion code complaining. Most likely a devboard artefact, since those just enable everything.

-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch