drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw xlut_clr()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
index d497bd0b84d35518227c71d9b84d3d717fd29d71..3f98f7f2f50473c15a0c038d8652aabc1a308a58 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
@@ -101,7 +101,8 @@ base507c_xlut_clr(struct nv50_wndw *wndw)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NV507C, 0x00e0, 0x00000000);
+       PUSH_MTHD(push, NV507C, SET_BASE_LUT_LO,
+                 NVDEF(NV507C, SET_BASE_LUT_LO, ENABLE, DISABLE));
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base907c.c b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
index 2fb033c623e9fc36a8387fc78d41e9382a9b8a28..789d7b7e9667d379d4f3d7572c2d48d1f8bdb1bd 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base907c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
@@ -57,9 +57,13 @@ base907c_xlut_clr(struct nv50_wndw *wndw)
        if ((ret = PUSH_WAIT(push, 6)))
                return ret;
 
-       PUSH_NVSQ(push, NV907C, 0x00e0, 0x00000000);
-       PUSH_NVSQ(push, NV907C, 0x00e8, 0x00000000);
-       PUSH_NVSQ(push, NV907C, 0x00fc, 0x00000000);
+       PUSH_MTHD(push, NV907C, SET_BASE_LUT_LO,
+                 NVDEF(NV907C, SET_BASE_LUT_LO, ENABLE, DISABLE));
+
+       PUSH_MTHD(push, NV907C, SET_OUTPUT_LUT_LO,
+                 NVDEF(NV907C, SET_OUTPUT_LUT_LO, ENABLE, DISABLE));
+
+       PUSH_MTHD(push, NV907C, SET_CONTEXT_DMA_LUT, 0x00000000);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
index 942b68ee4c75f498e6524cacb135184ce43c39df..d59a3a59e36dd1a00086f1051316c59434bc344b 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
@@ -59,7 +59,7 @@ wndwc37e_ilut_clr(struct nv50_wndw *wndw)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NVC37E, 0x02b8, 0x00000000);
+       PUSH_MTHD(push, NVC37E, SET_CONTEXT_DMA_INPUT_LUT, 0x00000000);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
index 86c50ed224ccb6d66194a061d9f97f205c27ad32..ffe5519f01632e486c8fda587e506bc9dfc92229 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
@@ -100,7 +100,7 @@ wndwc57e_ilut_clr(struct nv50_wndw *wndw)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NVC57E, 0x0444, 0x00000000);
+       PUSH_MTHD(push, NVC57E, SET_CONTEXT_DMA_ILUT, 0x00000000);
        return 0;
 }