aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-07-25 19:11:04 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-07-25 21:43:52 -0400
commitbf563a6b7c7efb283dd4ddf12cc90c2898195c16 (patch)
treef494321e388eaca4496e1751dd17faf61c634001
parentc04c5b1da18ec73eaabc7b8a8757545865426fc2 (diff)
drm/nv50: correct wait condition for instmem flush
Reported-by: Marcin Koƛcielnicki <koriakin@0x04.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_instmem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 2ed893cbff69..37c7b48ab24a 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -487,7 +487,7 @@ void
487nv50_instmem_flush(struct drm_device *dev) 487nv50_instmem_flush(struct drm_device *dev)
488{ 488{
489 nv_wr32(dev, 0x00330c, 0x00000001); 489 nv_wr32(dev, 0x00330c, 0x00000001);
490 if (!nv_wait(0x00330c, 0x00000001, 0x00000000)) 490 if (!nv_wait(0x00330c, 0x00000002, 0x00000000))
491 NV_ERROR(dev, "PRAMIN flush timeout\n"); 491 NV_ERROR(dev, "PRAMIN flush timeout\n");
492} 492}
493 493
@@ -495,7 +495,7 @@ void
495nv84_instmem_flush(struct drm_device *dev) 495nv84_instmem_flush(struct drm_device *dev)
496{ 496{
497 nv_wr32(dev, 0x070000, 0x00000001); 497 nv_wr32(dev, 0x070000, 0x00000001);
498 if (!nv_wait(0x070000, 0x00000001, 0x00000000)) 498 if (!nv_wait(0x070000, 0x00000002, 0x00000000))
499 NV_ERROR(dev, "PRAMIN flush timeout\n"); 499 NV_ERROR(dev, "PRAMIN flush timeout\n");
500} 500}
501 501