* [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping
@ 2012-05-20 16:55 Daniel Vetter
2012-05-20 17:16 ` Chris Wilson
2012-05-22 19:06 ` Daniel Vetter
0 siblings, 2 replies; 7+ messages in thread
From: Daniel Vetter @ 2012-05-20 16:55 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping
2012-05-20 16:55 [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping Daniel Vetter
@ 2012-05-20 17:16 ` Chris Wilson
2012-05-20 17:36 ` Daniel Vetter
2012-05-20 18:00 ` Daniel Vetter
2012-05-22 19:06 ` Daniel Vetter
1 sibling, 2 replies; 7+ messages in thread
From: Chris Wilson @ 2012-05-20 17:16 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
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
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping
2012-05-20 17:16 ` Chris Wilson
@ 2012-05-20 17:36 ` Daniel Vetter
2012-05-20 18:00 ` Daniel Vetter
1 sibling, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2012-05-20 17:36 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping
2012-05-20 17:16 ` Chris Wilson
2012-05-20 17:36 ` Daniel Vetter
@ 2012-05-20 18:00 ` Daniel Vetter
2012-05-20 18:51 ` Daniel Vetter
1 sibling, 1 reply; 7+ messages in thread
From: Daniel Vetter @ 2012-05-20 18:00 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping
2012-05-20 18:00 ` Daniel Vetter
@ 2012-05-20 18:51 ` Daniel Vetter
2012-05-21 14:48 ` Jesse Barnes
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Vetter @ 2012-05-20 18:51 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping
2012-05-20 18:51 ` Daniel Vetter
@ 2012-05-21 14:48 ` Jesse Barnes
0 siblings, 0 replies; 7+ messages in thread
From: Jesse Barnes @ 2012-05-21 14:48 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Vetter, Intel Graphics Development, Daniel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping
2012-05-20 16:55 [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping Daniel Vetter
2012-05-20 17:16 ` Chris Wilson
@ 2012-05-22 19:06 ` Daniel Vetter
1 sibling, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2012-05-22 19:06 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: 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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-05-22 19:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-20 16:55 [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping Daniel Vetter
2012-05-20 17:16 ` Chris Wilson
2012-05-20 17:36 ` Daniel Vetter
2012-05-20 18:00 ` Daniel Vetter
2012-05-20 18:51 ` Daniel Vetter
2012-05-21 14:48 ` Jesse Barnes
2012-05-22 19:06 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.