GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-08 07:38:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/nouveau/gem: convert indirect pushbufs to new push macros

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-22 20:01:38 +10:00
parent cd346a89d2
commit 183b70bbdf
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpu/drm/nouveau/nouveau_gem.c
View file

@ -35,6 +35,7 @@
#include "nouveau_vmm.h" #include "nouveau_vmm.h"
#include <nvif/class.h> #include <nvif/class.h>
#include <nvif/push206e.h>
void void
nouveau_gem_object_del(struct drm_gem_object *gem) nouveau_gem_object_del(struct drm_gem_object *gem)
@ -799,7 +800,7 @@ revalidate:
} }
} else } else
if (drm->client.device.info.chipset >= 0x25) { if (drm->client.device.info.chipset >= 0x25) {
ret = RING_SPACE(chan, req->nr_push * 2); ret = PUSH_WAIT(chan->chan.push, req->nr_push * 2);
if (ret) { if (ret) {
NV_PRINTK(err, cli, "cal_space: %d\n", ret); NV_PRINTK(err, cli, "cal_space: %d\n", ret);
goto out; goto out;
@ -809,11 +810,11 @@ revalidate:
struct nouveau_bo *nvbo = (void *)(unsigned long) struct nouveau_bo *nvbo = (void *)(unsigned long)
bo[push[i].bo_index].user_priv; bo[push[i].bo_index].user_priv;
OUT_RING(chan, (nvbo->offset + push[i].offset) | 2); PUSH_CALL(chan->chan.push, nvbo->offset + push[i].offset);
OUT_RING(chan, 0); PUSH_DATA(chan->chan.push, 0);
} }
} else { } else {
ret = RING_SPACE(chan, req->nr_push * (2 + NOUVEAU_DMA_SKIPS)); ret = PUSH_WAIT(chan->chan.push, req->nr_push * (2 + NOUVEAU_DMA_SKIPS));
if (ret) { if (ret) {
NV_PRINTK(err, cli, "jmp_space: %d\n", ret); NV_PRINTK(err, cli, "jmp_space: %d\n", ret);
goto out; goto out;
@ -843,11 +844,10 @@ revalidate:
push[i].length - 8) / 4, cmd); push[i].length - 8) / 4, cmd);
} }
OUT_RING(chan, 0x20000000 | PUSH_JUMP(chan->chan.push, nvbo->offset + push[i].offset);
(nvbo->offset + push[i].offset)); PUSH_DATA(chan->chan.push, 0);
OUT_RING(chan, 0);
for (j = 0; j < NOUVEAU_DMA_SKIPS; j++) for (j = 0; j < NOUVEAU_DMA_SKIPS; j++)
OUT_RING(chan, 0); PUSH_DATA(chan->chan.push, 0);
} }
} }