diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-06-21 12:16:24 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:51:02 +1000 |
| commit | 916722fce5a25a1ffefac616f8f0213de9ce0353 (patch) | |
| tree | dae85f5ee962dadf3c9728fb891c7d6ba9a7980c /drivers/gpu/drm/nouveau/dispnv50/headc37d.c | |
| parent | ed0b86a90bf91d0c41f6b373befd2ce98658b49e (diff) | |
| download | linux-stable-916722fce5a25a1ffefac616f8f0213de9ce0353.tar.gz linux-stable-916722fce5a25a1ffefac616f8f0213de9ce0353.tar.bz2 linux-stable-916722fce5a25a1ffefac616f8f0213de9ce0353.zip | |
drm/nouveau/kms/nv50-: use NVIDIA's headers for core head_curs_clr()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/headc37d.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c index a9ede937222d..48b8b4dbd693 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c +++ b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c @@ -101,8 +101,11 @@ headc37d_curs_clr(struct nv50_head *head) if ((ret = PUSH_WAIT(push, 4))) return ret; - PUSH_NVSQ(push, NVC37D, 0x209c + (i * 0x400), 0x000000cf); - PUSH_NVSQ(push, NVC37D, 0x2088 + (i * 0x400), 0x00000000); + PUSH_MTHD(push, NVC37D, HEAD_SET_CONTROL_CURSOR(i), + NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR, ENABLE, DISABLE) | + NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR, FORMAT, A8R8G8B8)); + + PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_CURSOR(i, 0), 0x00000000); return 0; } |