diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-06-20 07:57:12 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:50:52 +1000 |
| commit | 34cf8cae288e3d2cee08ab17fe458aec636d9def (patch) | |
| tree | 33aa4b78a463a433e9240cadc3bbe41f7b1e2699 /drivers/gpu/drm/nouveau/dispnv50/base507c.c | |
| parent | 9659be21e8034528839216b21794da73fdbedec2 (diff) | |
drm/nouveau/kms/nv50-: convert wndw sema_set() to new push macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/base507c.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/base507c.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c index c37f2278ce3e..ed0e5ce2190c 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c +++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c @@ -23,6 +23,7 @@ #include <nvif/cl507c.h> #include <nvif/event.h> +#include <nvif/push507c.h> #include <nvif/timer.h> #include <drm/drm_atomic_helper.h> @@ -163,18 +164,20 @@ base507c_sema_clr(struct nv50_wndw *wndw) } } -void +int base507c_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) { - u32 *push; - if ((push = evo_wait(&wndw->wndw, 5))) { - evo_mthd(push, 0x0088, 4); - evo_data(push, asyw->sema.offset); - evo_data(push, asyw->sema.acquire); - evo_data(push, asyw->sema.release); - evo_data(push, asyw->sema.handle); - evo_kick(push, &wndw->wndw); - } + struct nvif_push *push = wndw->wndw.push; + int ret; + + if ((ret = PUSH_WAIT(push, 5))) + return ret; + + PUSH_NVSQ(push, NV507C, 0x0088, asyw->sema.offset, + 0x008c, asyw->sema.acquire, + 0x0090, asyw->sema.release, + 0x0094, asyw->sema.handle); + return 0; } void |