diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2020-06-22 12:51:21 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 11:50:57 +0300 |
| commit | 0d2bdf2b0a73170cf7bc814aa44852a1d37387da (patch) | |
| tree | 9219c298a12e78910727bafdcd9e1e8130177253 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | 2bf00037c47f3252b75de3cc15da247c61d16fce (diff) | |
| download | linux-0d2bdf2b0a73170cf7bc814aa44852a1d37387da.tar.xz | |
drm/nouveau: convert nvsw init 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/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 3879919050a9..22d246acc5e5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -41,6 +41,7 @@ #include <nvif/driver.h> #include <nvif/fifo.h> +#include <nvif/push006c.h> #include <nvif/user.h> #include <nvif/class.h> @@ -367,11 +368,10 @@ nouveau_accel_gr_init(struct nouveau_drm *drm) NVDRM_NVSW, nouveau_abi16_swclass(drm), NULL, 0, &drm->channel->nvsw); if (ret == 0) { - ret = RING_SPACE(drm->channel, 2); - if (ret == 0) { - BEGIN_NV04(drm->channel, NvSubSw, 0, 1); - OUT_RING (drm->channel, drm->channel->nvsw.handle); - } + struct nvif_push *push = drm->channel->chan.push; + ret = PUSH_WAIT(push, 2); + if (ret == 0) + PUSH_NVSQ(push, NV_SW, 0x0000, drm->channel->nvsw.handle); } if (ret) { |