* [PATCH] drm/i915: Assert that the transcoder is indeed off before modifying it
@ 2012-05-11 8:21 Chris Wilson
2012-05-12 16:26 ` Daniel Vetter
2012-05-14 19:50 ` Jesse Barnes
0 siblings, 2 replies; 3+ messages in thread
From: Chris Wilson @ 2012-05-11 8:21 UTC (permalink / raw)
To: intel-gfx
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_display.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8d55dc9..12dba60 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2878,6 +2878,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
int pipe = intel_crtc->pipe;
u32 reg, temp;
+ assert_transcoder_disabled(dev_priv, pipe);
+
/* For PCH output, training FDI link */
dev_priv->display.fdi_link_train(crtc);
--
1.7.10
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Assert that the transcoder is indeed off before modifying it
2012-05-11 8:21 [PATCH] drm/i915: Assert that the transcoder is indeed off before modifying it Chris Wilson
@ 2012-05-12 16:26 ` Daniel Vetter
2012-05-14 19:50 ` Jesse Barnes
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2012-05-12 16:26 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Fri, May 11, 2012 at 09:21:25AM +0100, Chris Wilson wrote:
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Queued for -next with a slightly pimped commit message, thanks for the patch.
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Assert that the transcoder is indeed off before modifying it
2012-05-11 8:21 [PATCH] drm/i915: Assert that the transcoder is indeed off before modifying it Chris Wilson
2012-05-12 16:26 ` Daniel Vetter
@ 2012-05-14 19:50 ` Jesse Barnes
1 sibling, 0 replies; 3+ messages in thread
From: Jesse Barnes @ 2012-05-14 19:50 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Fri, 11 May 2012 09:21:25 +0100
Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8d55dc9..12dba60 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2878,6 +2878,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
> int pipe = intel_crtc->pipe;
> u32 reg, temp;
>
> + assert_transcoder_disabled(dev_priv, pipe);
> +
> /* For PCH output, training FDI link */
> dev_priv->display.fdi_link_train(crtc);
>
Seems like a reasonable check.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-14 19:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-11 8:21 [PATCH] drm/i915: Assert that the transcoder is indeed off before modifying it Chris Wilson
2012-05-12 16:26 ` Daniel Vetter
2012-05-14 19:50 ` Jesse Barnes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox