drm/nv50: correct wait condition for instmem flush
authorBen Skeggs <bskeggs@redhat.com>
Sun, 25 Jul 2010 23:11:04 +0000 (09:11 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 26 Jul 2010 01:43:52 +0000 (11:43 +1000)
Reported-by: Marcin Koƛcielnicki <koriakin@0x04.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_instmem.c

index 2ed893cbff69881268e49f1122db29bb042dac95..37c7b48ab24af8a37c3e8ac29656b989ec5935f5 100644 (file)
@@ -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");
 }