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

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

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base907c.c b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
index 0c49029..e962234 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base907c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
@@ -139,7 +139,8 @@ base907c_csc_clr(struct nv50_wndw *wndw)
        if ((ret = PUSH_WAIT(push, 2)))
                return ret;
 
-       PUSH_NVSQ(push, NV907C, 0x0140, 0x00000000);
+       PUSH_MTHD(push, NV907C, SET_CSC_RED2RED,
+                 NVDEF(NV907C, SET_CSC_RED2RED, OWNER, CORE));
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
index d2efbcc..1da5ffb 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
@@ -74,7 +74,7 @@ wndwc57e_csc_clr(struct nv50_wndw *wndw)
        if ((ret = PUSH_WAIT(push, 1 + ARRAY_SIZE(identity))))
                return ret;
 
-       PUSH_NVSQ(push, NVC57E, 0x0400, identity, ARRAY_SIZE(identity));
+       PUSH_MTHD(push, NVC57E, SET_FMT_COEFFICIENT_C00, identity, ARRAY_SIZE(identity));
        return 0;
 }