AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nouveau/drm: drop immediate parameter from nouveau_pushbuf_new

Browse Source 
It was always set to true.

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27853>
This commit is contained in:
Karol Herbst
2024-02-27 21:45:33 +01:00
committed by Marge Bot
parent 1a4c2cba95
commit a28cd6b1de
8 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nouveau/nouveau_screen.c
+4 -6
View File
@@ -232,10 +232,10 @@ nouveau_pushbuf_cb(struct nouveau_pushbuf *push)
int
nouveau_pushbuf_create(struct nouveau_screen *screen, struct nouveau_context *context,
struct nouveau_client *client, struct nouveau_object *chan, int nr,
uint32_t size, bool immediate, struct nouveau_pushbuf **push)
uint32_t size, struct nouveau_pushbuf **push)
{
int ret;
ret = nouveau_pushbuf_new(client, chan, nr, size, immediate, push);
ret = nouveau_pushbuf_new(client, chan, nr, size, push);
if (ret)
return ret;
@@ -396,8 +396,7 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
if (ret)
goto err;
ret = nouveau_pushbuf_create(screen, NULL, screen->client, screen->channel,
4, 512 * 1024, 1,
&screen->pushbuf);
4, 512 * 1024, &screen->pushbuf);
if (ret)
goto err;
@@ -506,8 +505,7 @@ nouveau_context_init(struct nouveau_context *context, struct nouveau_screen *scr
return ret;
ret = nouveau_pushbuf_create(screen, context, context->client, screen->channel,
4, 512 * 1024, 1,
&context->pushbuf);
4, 512 * 1024, &context->pushbuf);
if (ret)
return ret;
src/gallium/drivers/nouveau/nouveau_screen.h
+1 -1
View File
@@ -157,7 +157,7 @@ void nouveau_screen_init_vdec(struct nouveau_screen *);
int
nouveau_pushbuf_create(struct nouveau_screen *, struct nouveau_context *, struct nouveau_client *,
struct nouveau_object *chan, int nr, uint32_t size, bool immediate,
struct nouveau_object *chan, int nr, uint32_t size,
struct nouveau_pushbuf **);
void nouveau_pushbuf_destroy(struct nouveau_pushbuf **);
src/gallium/drivers/nouveau/nouveau_video.c
+1 -1
View File
@@ -530,7 +530,7 @@ nouveau_create_decoder(struct pipe_context *context,
ret = nouveau_client_new(screen->device, &dec->client);
if (ret)
goto fail;
ret = nouveau_pushbuf_create(screen, nouveau_context(context), dec->client, dec->chan, 2, 4096, 1, &dec->push);
ret = nouveau_pushbuf_create(screen, nouveau_context(context), dec->client, dec->chan, 2, 4096, &dec->push);
if (ret)
goto fail;
ret = nouveau_bufctx_new(dec->client, NV31_VIDEO_BIND_COUNT, &dec->bufctx);
src/gallium/drivers/nouveau/nv50/nv84_video.c
+2 -2
View File
@@ -335,7 +335,7 @@ nv84_create_decoder(struct pipe_context *context,
goto fail;
ret = nouveau_pushbuf_create(screen, &nv50->base, dec->client, dec->bsp_channel,
4, 32 * 1024, true, &dec->bsp_pushbuf);
4, 32 * 1024, &dec->bsp_pushbuf);
if (ret)
goto fail;
@@ -350,7 +350,7 @@ nv84_create_decoder(struct pipe_context *context,
if (ret)
goto fail;
ret = nouveau_pushbuf_create(screen, &nv50->base, dec->client, dec->vp_channel,
4, 32 * 1024, true, &dec->vp_pushbuf);
4, 32 * 1024, &dec->vp_pushbuf);
if (ret)
goto fail;
src/gallium/drivers/nouveau/nv50/nv98_video.c
+1 -1
View File
@@ -118,7 +118,7 @@ nv98_create_decoder(struct pipe_context *context,
if (!ret)
ret = nouveau_pushbuf_create(screen, &nv50->base, nv50->base.client, dec->channel[0],
4, 32 * 1024, true, &dec->pushbuf[0]);
4, 32 * 1024, &dec->pushbuf[0]);
for (i = 1; i < 3; ++i) {
dec->channel[i] = dec->channel[0];
src/gallium/drivers/nouveau/nvc0/nvc0_video.c
+1 -1
View File
@@ -159,7 +159,7 @@ nvc0_create_decoder(struct pipe_context *context,
if (!ret)
ret = nouveau_pushbuf_create(screen, &nvc0->base, nvc0->base.client, dec->channel[i],
4, 32 * 1024, true, &dec->pushbuf[i]);
4, 32 * 1024, &dec->pushbuf[i]);
if (ret)
break;
}
src/gallium/winsys/nouveau/drm/nouveau.c
+2 -2
View File
@@ -1514,7 +1514,7 @@ pushbuf_validate(struct nouveau_pushbuf *push, bool retry)
int
nouveau_pushbuf_new(struct nouveau_client *client, struct nouveau_object *chan, int nr,
uint32_t size, bool immediate, struct nouveau_pushbuf **ppush)
uint32_t size, struct nouveau_pushbuf **ppush)
{
struct nouveau_drm *drm = nouveau_drm(&client->device->object);
struct nouveau_fifo *fifo = chan->data;
@@ -1550,7 +1550,7 @@ nouveau_pushbuf_new(struct nouveau_client *client, struct nouveau_object *chan,
push = &nvpb->base;
push->client = client;
push->channel = immediate ? chan : NULL;
push->channel = chan;
push->flags = NOUVEAU_BO_RD;
if (fifo->pushbuf & NOUVEAU_GEM_DOMAIN_GART) {
push->flags |= NOUVEAU_BO_GART;
src/gallium/winsys/nouveau/drm/nouveau.h
+1 -1
View File
@@ -187,7 +187,7 @@ nouveau_bufctx_mthd(struct nouveau_bufctx *, int bin, uint32_t packet, struct n
void nouveau_bufctx_reset(struct nouveau_bufctx *, int bin);
int nouveau_pushbuf_new(struct nouveau_client *, struct nouveau_object *chan, int nr, uint32_t size,
bool immediate, struct nouveau_pushbuf **);
struct nouveau_pushbuf **);
void nouveau_pushbuf_del(struct nouveau_pushbuf **);
struct nouveau_bufctx *
nouveau_pushbuf_bufctx(struct nouveau_pushbuf *, struct nouveau_bufctx *);