* [PATCH] drm/i915: add LynxPoint-LP PCH ID
@ 2012-11-12 20:54 Paulo Zanoni
2012-11-12 23:04 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Paulo Zanoni @ 2012-11-12 20:54 UTC (permalink / raw)
To: intel-gfx; +Cc: Wei Shun Chang, Paulo Zanoni
From: Wei Shun Chang <wei.shun.chang@intel.com>
[pzanoni: rebase, print it's an LP PCH]
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
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.
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f8ba5fe..418d17c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -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);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: add LynxPoint-LP PCH ID
2012-11-12 20:54 [PATCH] drm/i915: add LynxPoint-LP PCH ID Paulo Zanoni
@ 2012-11-12 23:04 ` Daniel Vetter
2012-11-12 23:24 ` Josh Triplett
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2012-11-12 23:04 UTC (permalink / raw)
To: Paulo Zanoni, josh; +Cc: Wei Shun Chang, intel-gfx, Paulo Zanoni
On Mon, Nov 12, 2012 at 06:54:13PM -0200, Paulo Zanoni wrote:
> From: Wei Shun Chang <wei.shun.chang@intel.com>
>
> [pzanoni: rebase, print it's an LP PCH]
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> 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
>
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index f8ba5fe..418d17c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -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);
> }
> --
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: add LynxPoint-LP PCH ID
2012-11-12 23:04 ` Daniel Vetter
@ 2012-11-12 23:24 ` Josh Triplett
2012-11-12 23:29 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Josh Triplett @ 2012-11-12 23:24 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Wei Shun Chang, intel-gfx, Paulo Zanoni
On Tue, Nov 13, 2012 at 12:04:53AM +0100, Daniel Vetter wrote:
> On Mon, Nov 12, 2012 at 06:54:13PM -0200, Paulo Zanoni wrote:
> > From: Wei Shun Chang <wei.shun.chang@intel.com>
> >
> > [pzanoni: rebase, print it's an LP PCH]
> >
> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > ---
> > 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.
Tested-by: Josh Triplett <josh@joshtriplett.org>
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".
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index f8ba5fe..418d17c 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -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);
> > }
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: add LynxPoint-LP PCH ID
2012-11-12 23:24 ` Josh Triplett
@ 2012-11-12 23:29 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2012-11-12 23:29 UTC (permalink / raw)
To: Josh Triplett; +Cc: Wei Shun Chang, intel-gfx, Paulo Zanoni
On Mon, Nov 12, 2012 at 03:24:29PM -0800, Josh Triplett wrote:
> On Tue, Nov 13, 2012 at 12:04:53AM +0100, Daniel Vetter wrote:
> > On Mon, Nov 12, 2012 at 06:54:13PM -0200, Paulo Zanoni wrote:
> > > From: Wei Shun Chang <wei.shun.chang@intel.com>
> > >
> > > [pzanoni: rebase, print it's an LP PCH]
> > >
> > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > > ---
> > > 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.
>
> Tested-by: Josh Triplett <josh@joshtriplett.org>
Merged, thanks for testing&patch.
> 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
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-12 23:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-12 20:54 [PATCH] drm/i915: add LynxPoint-LP PCH ID Paulo Zanoni
2012-11-12 23:04 ` Daniel Vetter
2012-11-12 23:24 ` Josh Triplett
2012-11-12 23:29 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox