Attachment 93288 Details for Bug 73962 – drm/i915: Fix scanline counter fixup on BDW

[patch] drm/i915: Fix scanline counter fixup on BDW

0001-drm-i915-Fix-scanline-counter-fixup-on-BDW.patch (text/plain), 2.37 KB, created by Ville Syrjala on 2014-02-03 15:15:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2014-02-03 15:15:12 UTC

Size: 2.37 KB

patch

obsolete

>From f3b5f402ee1241828927aacecb145905808f185d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Mon, 3 Feb 2014 17:06:59 +0200
>Subject: [PATCH] drm/i915: Fix scanline counter fixup on BDW
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>The display interrupts changed on BDW, so the current ILK-HSW specific
>code in ilk_pipe_in_vblank_locked() doesn't work there. Add the required
>bits for BDW, and while at it, change the existing code to use nicer
>looking vblank status bit macros.
>
>Also remove the now stale __raw_i915_read16() definition which was
>left over from the failed gen2 ISR experiment.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73962
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/i915_irq.c | 30 +++++++++++-------------------
> 1 file changed, 11 insertions(+), 19 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index b226ae6..890b754 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -633,33 +633,25 @@ static u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe)
> 
> /* raw reads, only for fast reads of display block, no need for forcewake etc. */
> #define __raw_i915_read32(dev_priv__, reg__) readl((dev_priv__)->regs + (reg__))
>-#define __raw_i915_read16(dev_priv__, reg__) readw((dev_priv__)->regs + (reg__))
> 
> static bool ilk_pipe_in_vblank_locked(struct drm_device *dev, enum pipe pipe)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	uint32_t status;
>-
>-	if (INTEL_INFO(dev)->gen < 7) {
>-		status = pipe == PIPE_A ?
>-			DE_PIPEA_VBLANK :
>-			DE_PIPEB_VBLANK;
>+	int reg;
>+
>+	if (INTEL_INFO(dev)->gen >= 8) {
>+		status = GEN8_PIPE_VBLANK;
>+		reg = GEN8_DE_PIPE_ISR(pipe);
>+	} else if (INTEL_INFO(dev)->gen >= 7) {
>+		status = DE_PIPE_VBLANK_IVB(pipe);
>+		reg = DEISR;
> 	} else {
>-		switch (pipe) {
>-		default:
>-		case PIPE_A:
>-			status = DE_PIPEA_VBLANK_IVB;
>-			break;
>-		case PIPE_B:
>-			status = DE_PIPEB_VBLANK_IVB;
>-			break;
>-		case PIPE_C:
>-			status = DE_PIPEC_VBLANK_IVB;
>-			break;
>-		}
>+		status = DE_PIPE_VBLANK(pipe);
>+		reg = DEISR;
> 	}
> 
>-	return __raw_i915_read32(dev_priv, DEISR) & status;
>+	return __raw_i915_read32(dev_priv, reg) & status;
> }
> 
> static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 73962: 92641 | 93288

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.