drm/nouveau/kms/nv50-: use NVIDIA's headers for core head_olut_clr()

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

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head507d.c b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
index f46603c..0bdacc9 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
@@ -256,7 +256,8 @@ head507d_olut_clr(struct nv50_head *head)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NV507D, 0x0840 + (i * 0x400), 0x00000000);
+       PUSH_MTHD(push, NV507D, HEAD_SET_BASE_LUT_LO(i),
+                 NVDEF(NV507D, HEAD_SET_BASE_LUT_LO, ENABLE, DISABLE));
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head827d.c b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
index 01a8887..6cae23f 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head827d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
@@ -91,8 +91,10 @@ head827d_olut_clr(struct nv50_head *head)
        if ((ret = PUSH_WAIT(push, 4)))
                return ret;
 
-       PUSH_NVSQ(push, NV827D, 0x0840 + (i * 0x400), 0x00000000);
-       PUSH_NVSQ(push, NV827D, 0x085c + (i * 0x400), 0x00000000);
+       PUSH_MTHD(push, NV827D, HEAD_SET_BASE_LUT_LO(i),
+                 NVDEF(NV827D, HEAD_SET_BASE_LUT_LO, ENABLE, DISABLE));
+
+       PUSH_MTHD(push, NV827D, HEAD_SET_CONTEXT_DMA_LUT(i), 0x00000000);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head907d.c b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
index 69aa24b..a54ac9e 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
@@ -220,8 +220,10 @@ head907d_olut_clr(struct nv50_head *head)
        if ((ret = PUSH_WAIT(push, 4)))
                return ret;
 
-       PUSH_NVSQ(push, NV907D, 0x0448 + (i * 0x300), 0x00000000);
-       PUSH_NVSQ(push, NV907D, 0x045c + (i * 0x300), 0x00000000);
+       PUSH_MTHD(push, NV907D, HEAD_SET_OUTPUT_LUT_LO(i),
+                 NVDEF(NV907D, HEAD_SET_OUTPUT_LUT_LO, ENABLE, DISABLE));
+
+       PUSH_MTHD(push, NV907D, HEAD_SET_CONTEXT_DMA_LUT(i), 0x00000000);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
index eb81ed1..8898b65 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
@@ -143,7 +143,7 @@ headc37d_olut_clr(struct nv50_head *head)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NVC37D, 0x20ac + (i * 0x400), 0x00000000);
+       PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_OUTPUT_LUT(i), 0x00000000);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
index 9cd4781..3c0001c 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
@@ -85,7 +85,7 @@ headc57d_olut_clr(struct nv50_head *head)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NVC57D, 0x2288 + (i * 0x400), 0x00000000);
+       PUSH_MTHD(push, NVC57D, HEAD_SET_CONTEXT_DMA_OLUT(i), 0x00000000);
        return 0;
 }