diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2020-06-20 17:06:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:50:53 +1000 |
| commit | 3c43c362b3a50a0e7d2cd5d6dc721a74d9e27694 (patch) | |
| tree | dd1233d6dad883e163ae20687192196ff6980435 /drivers/gpu/drm/nouveau/dispnv50/core507d.c | |
| parent | drm/nouveau/kms/nv50-: convert core init() to new push macros (diff) | |
| download | wireguard-linux-3c43c362b3a50a0e7d2cd5d6dc721a74d9e27694.tar.xz wireguard-linux-3c43c362b3a50a0e7d2cd5d6dc721a74d9e27694.zip | |
drm/nouveau/kms/nv50-: convert core caps_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/dispnv50/core507d.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/core507d.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c index ce6f6494d445..455509c74d48 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c +++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c @@ -66,15 +66,14 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) int core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp) { - u32 *push = evo_wait(&disp->core->chan, 2); + struct nvif_push *push = disp->core->chan.push; + int ret; - if (push) { - evo_mthd(push, 0x008c, 1); - evo_data(push, 0x0); - evo_kick(push, &disp->core->chan); - } + if ((ret = PUSH_WAIT(push, 2))) + return ret; - return 0; + PUSH_NVSQ(push, NV507D, 0x008c, 0x00000000); + return PUSH_KICK(push); } int |