diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-02-07 16:34:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-22 13:34:48 -0800 |
| commit | f1a68b16801be34cd5ff763a4e0133e00a499f1e (patch) | |
| tree | d75bf01417d7870d47f90f6dec31c69dc3998ef0 | |
| parent | 266a1a2eacfb064ad2f1f97f5aa912d12a9fda75 (diff) | |
| download | lwn-f1a68b16801be34cd5ff763a4e0133e00a499f1e.tar.gz lwn-f1a68b16801be34cd5ff763a4e0133e00a499f1e.zip | |
drm/i915: Fix intel_pipe_to_cpu_transcoder for UMS
commit a2d213dd77da4710bcb75f8efe85a32e3db8b39b upstream.
We don't have all the drm_crtc&co hanging around in that case.
This regression has been introduced in
commit 391f75e2bf13f105d9e4a120736ccdd8e3bc638b
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Wed Sep 25 19:55:26 2013 +0300
drm/i915: Fix pre-CTG vblank counter
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=69521
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index f13d5edc39d5..a20917789c59 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -567,8 +567,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, int pipe) vbl_start = mode->crtc_vblank_start * mode->crtc_htotal; } else { - enum transcoder cpu_transcoder = - intel_pipe_to_cpu_transcoder(dev_priv, pipe); + enum transcoder cpu_transcoder = (enum transcoder) pipe; u32 htotal; htotal = ((I915_READ(HTOTAL(cpu_transcoder)) >> 16) & 0x1fff) + 1; |