From: Ben Skeggs <bskeggs@redhat.com>
Date: Sun, 25 Jul 2010 23:11:04 +0000 (+1000)
Subject: drm/nv50: correct wait condition for instmem flush
X-Git-Tag: v3.0~3480^2~78^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf563a6b7c7efb283dd4ddf12cc90c2898195c16;p=platform%2Fkernel%2Flinux-amlogic.git

drm/nv50: correct wait condition for instmem flush

Reported-by: Marcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 2ed893c..37c7b48 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -487,7 +487,7 @@ void
 nv50_instmem_flush(struct drm_device *dev)
 {
 	nv_wr32(dev, 0x00330c, 0x00000001);
-	if (!nv_wait(0x00330c, 0x00000001, 0x00000000))
+	if (!nv_wait(0x00330c, 0x00000002, 0x00000000))
 		NV_ERROR(dev, "PRAMIN flush timeout\n");
 }
 
@@ -495,7 +495,7 @@ void
 nv84_instmem_flush(struct drm_device *dev)
 {
 	nv_wr32(dev, 0x070000, 0x00000001);
-	if (!nv_wait(0x070000, 0x00000001, 0x00000000))
+	if (!nv_wait(0x070000, 0x00000002, 0x00000000))
 		NV_ERROR(dev, "PRAMIN flush timeout\n");
 }