Attachment 81830 Details for Bug 65495 – fix media reset on gm45

[patch] fix media reset on gm45

0001-drm-i915-fix-media-reset-on-gm45.patch (text/plain), 1.91 KB, created by Daniel Vetter on 2013-07-01 21:17:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-07-01 21:17:13 UTC

Size: 1.91 KB

patch

obsolete

>From 8c5793d00f1a70852a653fb934907fe1820d9cea Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Mon, 1 Jul 2013 23:10:09 +0200
>Subject: [PATCH] drm/i915: fix media reset on gm45
>
>Apparently doing a read-modify-write is bad since that means old gunk
>gets left behind. Also clear the register afterwards just for
>paranoia.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65495
>Cc: stable@vger.kernel.org
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_drv.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 062cbda..37e634d 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -793,28 +793,27 @@ static int i965_reset_complete(struct drm_device *dev)
> static int i965_do_reset(struct drm_device *dev)
> {
> 	int ret;
>-	u8 gdrst;
> 
> 	/*
> 	 * Set the domains we want to reset (GRDOM/bits 2 and 3) as
> 	 * well as the reset bit (GR/bit 0).  Setting the GR bit
> 	 * triggers the reset; when done, the hardware will clear it.
> 	 */
>-	pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst);
> 	pci_write_config_byte(dev->pdev, I965_GDRST,
>-			      gdrst | GRDOM_RENDER |
>-			      GRDOM_RESET_ENABLE);
>+			      GRDOM_RENDER | GRDOM_RESET_ENABLE);
> 	ret =  wait_for(i965_reset_complete(dev), 500);
> 	if (ret)
> 		return ret;
> 
> 	/* We can't reset render&media without also resetting display ... */
>-	pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst);
> 	pci_write_config_byte(dev->pdev, I965_GDRST,
>-			      gdrst | GRDOM_MEDIA |
>-			      GRDOM_RESET_ENABLE);
>+			      GRDOM_MEDIA | GRDOM_RESET_ENABLE);
>+
>+	ret =  wait_for(i965_reset_complete(dev), 500);
>+	if (ret)
>+		return ret;
> 
>-	return wait_for(i965_reset_complete(dev), 500);
>+	pci_write_config_byte(dev->pdev, I965_GDRST, 0);
> }
> 
> static int ironlake_do_reset(struct drm_device *dev)
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 65495: 80719 | 80754 | 81830 | 81860

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.