[PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[Daniel Vetter]

This should fix breakage introduced in

commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Fri Apr 20 17:11:53 2012 +0100

    drm/i915: manage PCH PLLs separately from pipes

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/intel_display.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f3d39f4..f4b2ce9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2911,6 +2911,14 @@ static struct intel_pch_pll *intel_get_pch_pll(struct intel_crtc *intel_crtc, u3
 		goto prepare;
 	}
 
+	if (HAS_PCH_IBX(dev_priv->dev)) {
+		/* Ironlake PCH has a fixed PLL->PCH pipe mapping. */
+		i = intel_crtc->pipe;
+		pll = &dev_priv->pch_plls[i];
+
+		goto found;
+	}
+
 	for (i = 0; i < dev_priv->num_pch_pll; i++) {
 		pll = &dev_priv->pch_plls[i];
 
-- 
1.7.10

Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[Chris Wilson]

On Sun, 20 May 2012 18:55:09 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> This should fix breakage introduced in
> 
> commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date:   Fri Apr 20 17:11:53 2012 +0100
> 
>     drm/i915: manage PCH PLLs separately from pipes
> 
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f3d39f4..f4b2ce9 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2911,6 +2911,14 @@ static struct intel_pch_pll *intel_get_pch_pll(struct intel_crtc *intel_crtc, u3
>  		goto prepare;
>  	}
>  
> +	if (HAS_PCH_IBX(dev_priv->dev)) {
Aside from the debate we had whether HAS_PCH_IBX or !HAS_PCH_CPT was
more appropriate considering the later switching on HAS_PCH_CPT for
selectable DPLLs...

> +		/* Ironlake PCH has a fixed PLL->PCH pipe mapping. */
> +		i = intel_crtc->pipe;
> +		pll = &dev_priv->pch_plls[i];
DRM_DEBUG_KMS("CRTC:%d pre-allocated PCH PLL %x\n",
	      intel_crtc->base.base.id, pll->pll_reg);

so that we have a consistent DEBUG story along all paths.

I should have spotted that much earlier,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[Daniel Vetter]

This should fix breakage introduced in

commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Fri Apr 20 17:11:53 2012 +0100

    drm/i915: manage PCH PLLs separately from pipes

v2: Add a DRM_DEBUG_KMS message to explain why a given pll was
selected, suggested by Chris Wilson.

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/intel_display.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f3d39f4..f4b2ce9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2911,6 +2911,14 @@ static struct intel_pch_pll *intel_get_pch_pll(struct intel_crtc *intel_crtc, u3
 		goto prepare;
 	}
 
+	if (HAS_PCH_IBX(dev_priv->dev)) {
+		/* Ironlake PCH has a fixed PLL->PCH pipe mapping. */
+		i = intel_crtc->pipe;
+		pll = &dev_priv->pch_plls[i];
+
+		goto found;
+	}
+
 	for (i = 0; i < dev_priv->num_pch_pll; i++) {
 		pll = &dev_priv->pch_plls[i];
 
-- 
1.7.10

[PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[Daniel Vetter]

This should fix breakage introduced in

commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Fri Apr 20 17:11:53 2012 +0100

    drm/i915: manage PCH PLLs separately from pipes

v2: Add a DRM_DEBUG_KMS message to explain why a given pll was
selected, suggested by Chris Wilson.

v3: Actually run git add.

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/intel_display.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f3d39f4..3c71850 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2911,6 +2911,17 @@ static struct intel_pch_pll *intel_get_pch_pll(struct intel_crtc *intel_crtc, u3
 		goto prepare;
 	}
 
+	if (HAS_PCH_IBX(dev_priv->dev)) {
+		/* Ironlake PCH has a fixed PLL->PCH pipe mapping. */
+		i = intel_crtc->pipe;
+		pll = &dev_priv->pch_plls[i];
+
+		DRM_DEBUG_KMS("CRTC:%d using pre-allocated PCH PLL %x\n",
+			      intel_crtc->base.base.id, pll->pll_reg);
+
+		goto found;
+	}
+
 	for (i = 0; i < dev_priv->num_pch_pll; i++) {
 		pll = &dev_priv->pch_plls[i];
 
-- 
1.7.10

Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[Daniel Vetter]

On Sun, May 20, 2012 at 08:00:25PM +0200, Daniel Vetter wrote:
> This should fix breakage introduced in
> 
> commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date:   Fri Apr 20 17:11:53 2012 +0100
> 
>     drm/i915: manage PCH PLLs separately from pipes
> 
> v2: Add a DRM_DEBUG_KMS message to explain why a given pll was
> selected, suggested by Chris Wilson.
> 
> v3: Actually run git add.
> 
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Ok, I've merged this one to dinq. I could reproduce a failure on my ilk
by forcing the crtc which looked very much like what QA is hitting, and
this patch does indeed fix that.
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[Jesse Barnes]

On Sun, 20 May 2012 20:51:19 +0200
Daniel Vetter <daniel@ffwll.ch> wrote:

> On Sun, May 20, 2012 at 08:00:25PM +0200, Daniel Vetter wrote:
> > This should fix breakage introduced in
> > 
> > commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b
> > Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> > Date:   Fri Apr 20 17:11:53 2012 +0100
> > 
> >     drm/i915: manage PCH PLLs separately from pipes
> > 
> > v2: Add a DRM_DEBUG_KMS message to explain why a given pll was
> > selected, suggested by Chris Wilson.
> > 
> > v3: Actually run git add.
> > 
> > Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712
> > Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> Ok, I've merged this one to dinq. I could reproduce a failure on my ilk
> by forcing the crtc which looked very much like what QA is hitting, and
> this patch does indeed fix that.

Great, thanks Daniel.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping

[Daniel Vetter]

On Sun, May 20, 2012 at 06:55:09PM +0200, Daniel Vetter wrote:
> This should fix breakage introduced in
> 
> commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date:   Fri Apr 20 17:11:53 2012 +0100
> 
>     drm/i915: manage PCH PLLs separately from pipes
> 
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Patch merge to fixes with Jesse's irc r-b.
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48