iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/kms/nv50-: use NVIDIA's headers for wimm update()

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs 2020-06-21 10:36:33 +10:00
parent 937014086a
commit 852dfbde91
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
View File

@ -46,9 +46,12 @@ curs507a_space(struct nv50_wndw *wndw)
static int static int
curs507a_update(struct nv50_wndw *wndw, u32 *interlock) curs507a_update(struct nv50_wndw *wndw, u32 *interlock)
{ {
struct nvif_object *user = &wndw->wimm.base.user;
int ret = nvif_chan_wait(&wndw->wimm, 1); int ret = nvif_chan_wait(&wndw->wimm, 1);
if (ret == 0) if (ret == 0) {
nvif_wr32(&wndw->wimm.base.user, 0x0080, 0x00000000); NVIF_WR32(user, NV507A, UPDATE,
NVDEF(NV507A, UPDATE, INTERLOCK_WITH_CORE, DISABLE));
}
return ret; return ret;
} }

3
drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
View File

@ -27,9 +27,10 @@
static int static int
cursc37a_update(struct nv50_wndw *wndw, u32 *interlock) cursc37a_update(struct nv50_wndw *wndw, u32 *interlock)
{ {
struct nvif_object *user = &wndw->wimm.base.user;
int ret = nvif_chan_wait(&wndw->wimm, 1); int ret = nvif_chan_wait(&wndw->wimm, 1);
if (ret == 0) if (ret == 0)
nvif_wr32(&wndw->wimm.base.user, 0x0200, 0x00000001); NVIF_WR32(user, NVC37A, UPDATE, 0x00000001);
return ret; return ret;
} }

6
drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
View File

@ -37,9 +37,9 @@ wimmc37b_update(struct nv50_wndw *wndw, u32 *interlock)
if ((ret = PUSH_WAIT(push, 2))) if ((ret = PUSH_WAIT(push, 2)))
return ret; return ret;
PUSH_NVSQ(push, NVC37B, 0x0200, ((interlock[NV50_DISP_INTERLOCK_WNDW] & PUSH_MTHD(push, NVC37B, UPDATE, 0x00000001 |
wndw->interlock.data) ? 0x00000002 : 0x00000000) | NVVAL(NVC37B, UPDATE, INTERLOCK_WITH_WINDOW,
0x00000001); !!(interlock[NV50_DISP_INTERLOCK_WNDW] & wndw->interlock.data)));
return PUSH_KICK(push); return PUSH_KICK(push);
} }