From 66f7b7bddfe60a708c7711e47c95d20db05e2110 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sat, 20 Jun 2020 11:58:58 +1000 Subject: [PATCH] drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw xlut_clr() Signed-off-by: Ben Skeggs Reviewed-by: Lyude Paul --- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 3 ++- drivers/gpu/drm/nouveau/dispnv50/base907c.c | 10 +++++++--- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c index d497bd0..3f98f7f 100644 --- 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 2fb033c..789d7b7e 100644 --- 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 942b68e..d59a3a5 100644 --- 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 86c50ed..ffe5519 100644 --- 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; } -- 2.7.4