drm/nouveau/fb: switch to new-style timer macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
index 54d8cb55ad95e0cbf3e221969df9611b9e2a470d..56bdfeeab8e7978e1144e7a35200732b4a821a6e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
@@ -94,8 +94,19 @@ nv40_ram_prog(struct nvkm_fb *fb)
        for (i = 0; i < 2; i++) {
                if (!(crtc_mask & (1 << i)))
                        continue;
-               nv_wait(fb, 0x600808 + (i * 0x2000), 0x00010000, 0x00000000);
-               nv_wait(fb, 0x600808 + (i * 0x2000), 0x00010000, 0x00010000);
+
+               nvkm_msec(device, 2000,
+                       u32 tmp = nvkm_rd32(device, 0x600808 + (i * 0x2000));
+                       if (!(tmp & 0x00010000))
+                               break;
+               );
+
+               nvkm_msec(device, 2000,
+                       u32 tmp = nvkm_rd32(device, 0x600808 + (i * 0x2000));
+                       if ( (tmp & 0x00010000))
+                               break;
+               );
+
                nvkm_wr08(device, 0x0c03c4 + (i * 0x2000), 0x01);
                nvkm_wr08(device, 0x0c03c5 + (i * 0x2000), sr1[i] | 0x20);
        }
@@ -155,7 +166,13 @@ nv40_ram_prog(struct nvkm_fb *fb)
        for (i = 0; i < 2; i++) {
                if (!(crtc_mask & (1 << i)))
                        continue;
-               nv_wait(fb, 0x600808 + (i * 0x2000), 0x00010000, 0x00010000);
+
+               nvkm_msec(device, 2000,
+                       u32 tmp = nvkm_rd32(device, 0x600808 + (i * 0x2000));
+                       if ( (tmp & 0x00010000))
+                               break;
+               );
+
                nvkm_wr08(device, 0x0c03c4 + (i * 0x2000), 0x01);
                nvkm_wr08(device, 0x0c03c5 + (i * 0x2000), sr1[i]);
        }