Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nv50_cursor.c

diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
index adfc9b607a50dfc0ecd1d9d8c6e6d991548ae507..af4ec7bf3670f26625f6b1ced86360c48367dfe2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_cursor.c
+++ b/drivers/gpu/drm/nouveau/nv50_cursor.c
@@ -53,15 +53,15 @@ nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
        }
 
        if (dev_priv->chipset != 0x50) {
-               BEGIN_RING(evo, 0, NV84_EVO_CRTC(nv_crtc->index, CURSOR_DMA), 1);
+               BEGIN_NV04(evo, 0, NV84_EVO_CRTC(nv_crtc->index, CURSOR_DMA), 1);
                OUT_RING(evo, NvEvoVRAM);
        }
-       BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc->index, CURSOR_CTRL), 2);
+       BEGIN_NV04(evo, 0, NV50_EVO_CRTC(nv_crtc->index, CURSOR_CTRL), 2);
        OUT_RING(evo, NV50_EVO_CRTC_CURSOR_CTRL_SHOW);
        OUT_RING(evo, nv_crtc->cursor.offset >> 8);
 
        if (update) {
-               BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
+               BEGIN_NV04(evo, 0, NV50_EVO_UPDATE, 1);
                OUT_RING(evo, 0);
                FIRE_RING(evo);
                nv_crtc->cursor.visible = true;
@@ -86,16 +86,16 @@ nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
                NV_ERROR(dev, "no space while hiding cursor\n");
                return;
        }
-       BEGIN_RING(evo, 0, NV50_EVO_CRTC(nv_crtc->index, CURSOR_CTRL), 2);
+       BEGIN_NV04(evo, 0, NV50_EVO_CRTC(nv_crtc->index, CURSOR_CTRL), 2);
        OUT_RING(evo, NV50_EVO_CRTC_CURSOR_CTRL_HIDE);
        OUT_RING(evo, 0);
        if (dev_priv->chipset != 0x50) {
-               BEGIN_RING(evo, 0, NV84_EVO_CRTC(nv_crtc->index, CURSOR_DMA), 1);
+               BEGIN_NV04(evo, 0, NV84_EVO_CRTC(nv_crtc->index, CURSOR_DMA), 1);
                OUT_RING(evo, NV84_EVO_CRTC_CURSOR_DMA_HANDLE_NONE);
        }
 
        if (update) {
-               BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
+               BEGIN_NV04(evo, 0, NV50_EVO_UPDATE, 1);
                OUT_RING(evo, 0);
                FIRE_RING(evo);
                nv_crtc->cursor.visible = false;