diff options
| author | Chris Wilson | 2012-05-11 10:21:25 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-05-19 22:39:52 +0200 |
| commit | e7e164db6db292d6f804ec6cd25f29ff62dd0618 (patch) | |
| tree | ce7f6e532436215857ab7ba1545f1525018cacd1 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: hook Haswell devices in place (diff) | |
| download | kernel-qcow2-linux-e7e164db6db292d6f804ec6cd25f29ff62dd0618.tar.gz kernel-qcow2-linux-e7e164db6db292d6f804ec6cd25f29ff62dd0618.tar.xz kernel-qcow2-linux-e7e164db6db292d6f804ec6cd25f29ff62dd0618.zip | |
drm/i915: Assert that the transcoder is indeed off before modifying it
Inspired by a recent regression that seems to confuse pch transcoder
state, let's be a bit more paranoid.
References: https://bugs.freedesktop.org/show_bug.cgi?id=49712
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Pimped commit message.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1a06f97e73f8..391439fa17b2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2782,6 +2782,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); |