diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-06-20 11:58:58 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:51:00 +1000 |
| commit | 66f7b7bddfe60a708c7711e47c95d20db05e2110 (patch) | |
| tree | c36e7a806135fe1a586a2fe354460cfbad302785 /drivers/gpu | |
| parent | 6833d2a0c778252929805fabfdc89e4e181fcb82 (diff) | |
| download | linux-stable-66f7b7bddfe60a708c7711e47c95d20db05e2110.tar.gz linux-stable-66f7b7bddfe60a708c7711e47c95d20db05e2110.tar.bz2 linux-stable-66f7b7bddfe60a708c7711e47c95d20db05e2110.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/base507c.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/base907c.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 | ||||
| -rw-r--r-- | 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 d497bd0b84d3..3f98f7f2f504 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 2fb033c623e9..789d7b7e9667 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 942b68ee4c75..d59a3a59e36d 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 86c50ed224cc..ffe5519f0163 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; } |