Commit a2d213dd authored Feb 07, 2014 by Daniel Vetter

drm/i915: Fix intel_pipe_to_cpu_transcoder for UMS

We don't have all the drm_crtc&co hanging around in that case.

This regression has been introduced in

commit 391f75e2
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: stable@vger.kernel.org (for 3.13 only)
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>

parent 4e6b788c

drivers/gpu/drm/i915/i915_irq.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;		vbl_start = mode->crtc_vblank_start * mode->crtc_htotal;
	} else {		} else {
	enum transcoder cpu_transcoder =		enum transcoder cpu_transcoder = (enum transcoder) pipe;
	intel_pipe_to_cpu_transcoder(dev_priv, pipe);
	u32 htotal;		u32 htotal;

	htotal = ((I915_READ(HTOTAL(cpu_transcoder)) >> 16) & 0x1fff) + 1;		htotal = ((I915_READ(HTOTAL(cpu_transcoder)) >> 16) & 0x1fff) + 1;