Attachment 111369 Details for Bug 87244 – Revert-drm-nouveau-fifo-g84-ack-non-stall-interrupt

[patch] Revert-drm-nouveau-fifo-g84-ack-non-stall-interrupt

0002-Revert-drm-nouveau-fifo-g84-ack-non-stall-interrupt-.patch (text/plain), 2.25 KB, created by Zlatko Calusic on 2014-12-26 12:52:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zlatko Calusic

Created: 2014-12-26 12:52:15 UTC

Size: 2.25 KB

patch

obsolete

>From e8e3be42bbd9469edba157b631162d7a8c7b35f6 Mon Sep 17 00:00:00 2001
>From: Zlatko Calusic <zcalusic@bitsync.net>
>Date: Fri, 12 Dec 2014 20:04:29 +0100
>Subject: [PATCH 2/2] Revert "drm/nouveau/fifo/g84-: ack non-stall interrupt
> before handling it"
>
>This reverts commit 19a10828814aa3ba483301b416b27f94330e0c80.
>---
> drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c | 2 +-
> drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 4 ++--
> drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
>index d95fd13..6d7e3a8 100644
>--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
>+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
>@@ -544,8 +544,8 @@ nv04_fifo_intr(struct nouveau_subdev *subdev)
> 			}
> 
> 			if (status & 0x40000000) {
>-				nv_wr32(priv, 0x002100, 0x40000000);
> 				nouveau_fifo_uevent(&priv->base);
>+				nv_wr32(priv, 0x002100, 0x40000000);
> 				status &= ~0x40000000;
> 			}
> 		}
>diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
>index 074d434..1fe1f8f 100644
>--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
>+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
>@@ -740,8 +740,6 @@ nvc0_fifo_intr_engine_unit(struct nvc0_fifo_priv *priv, int engn)
> 	u32 inte = nv_rd32(priv, 0x002628);
> 	u32 unkn;
> 
>-	nv_wr32(priv, 0x0025a8 + (engn * 0x04), intr);
>-
> 	for (unkn = 0; unkn < 8; unkn++) {
> 		u32 ints = (intr >> (unkn * 0x04)) & inte;
> 		if (ints & 0x1) {
>@@ -753,6 +751,8 @@ nvc0_fifo_intr_engine_unit(struct nvc0_fifo_priv *priv, int engn)
> 			nv_mask(priv, 0x002628, ints, 0);
> 		}
> 	}
>+
>+	nv_wr32(priv, 0x0025a8 + (engn * 0x04), intr);
> }
> 
> static void
>diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
>index 6a8db7c..fc9ef66 100644
>--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
>+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
>@@ -982,8 +982,8 @@ nve0_fifo_intr(struct nouveau_subdev *subdev)
> 	}
> 
> 	if (stat & 0x80000000) {
>-		nv_wr32(priv, 0x002100, 0x80000000);
> 		nve0_fifo_intr_engine(priv);
>+		nv_wr32(priv, 0x002100, 0x80000000);
> 		stat &= ~0x80000000;
> 	}
> 
>-- 
>2.1.3
>

Actions: View | Splinter Review

Attachments on bug 87244: 110752 | 111369 | 112875

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.