From 75baaa954bfb63961982079e5437de3edd812b1f Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 20 Jun 2020 11:36:58 +1000
Subject: drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw csc_clr()
Git-commit: 2740edb3c640e7a13fdfe752bb17154fd824f28d
Patch-mainline: v5.9-rc1
References: jsc#SLE-12680, jsc#SLE-12880, jsc#SLE-12882, jsc#SLE-12883, jsc#SLE-13496, jsc#SLE-15322
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/gpu/drm/nouveau/dispnv50/base907c.c | 3 ++-
drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/base907c.c b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
index 0c490291d014..e962234f62d6 100644
--- 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 d2efbccbaf3f..1da5ffbae4eb 100644
--- 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;
}
--
2.29.2