fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-23 05:10:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nouveau/winsys: Refactor nouveau_ws_context_create()

Browse source 
Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36641>
This commit is contained in:
Faith Ekstrand 2025-08-04 14:30:20 -04:00 • committed by Marge Bot
parent 4bcb784339
commit 5eb2c2ab06
1 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/nouveau/winsys/nouveau_context.c
View file

@ -123,33 +123,29 @@ nouveau_ws_channel_dealloc(int fd, int channel)
assert(!ret);
}
int
nouveau_ws_context_create(struct nouveau_ws_device *dev,
enum nouveau_ws_engines engines,
struct nouveau_ws_context **out)
static int
nouveau_ws_3d_context_init(struct nouveau_ws_device *dev,
struct nouveau_ws_context *ctx,
enum nouveau_ws_engines engines)
{
struct drm_nouveau_channel_alloc req = { };
uint32_t classes[NOUVEAU_WS_CONTEXT_MAX_CLASSES];
uint32_t base;
*out = CALLOC_STRUCT(nouveau_ws_context);
if (!*out)
return -ENOMEM;
int ret = drmCommandWriteRead(dev->fd, DRM_NOUVEAU_CHANNEL_ALLOC, &req, sizeof(req));
if (ret)
goto fail_alloc;
return ret;
ret = nouveau_ws_context_query_classes(dev->fd, req.channel, classes);
if (ret)
goto fail_subchan;
return ret;
base = (uint32_t)(0xbeef + req.channel) << 16;
if (engines & NOUVEAU_WS_ENGINE_COPY) {
uint32_t obj_class = nouveau_ws_context_find_class(classes, 0xb5);
ret = nouveau_ws_subchan_alloc(dev->fd, req.channel, 0,
obj_class, &(*out)->copy);
obj_class, &ctx->copy);
if (ret)
goto fail_subchan;
}
@ -157,7 +153,7 @@ nouveau_ws_context_create(struct nouveau_ws_device *dev,
if (engines & NOUVEAU_WS_ENGINE_2D) {
uint32_t obj_class = nouveau_ws_context_find_class(classes, 0x2d);
ret = nouveau_ws_subchan_alloc(dev->fd, req.channel, base | 0x902d,
obj_class, &(*out)->eng2d);
obj_class, &ctx->eng2d);
if (ret)
goto fail_subchan;
}
@ -165,7 +161,7 @@ nouveau_ws_context_create(struct nouveau_ws_device *dev,
if (engines & NOUVEAU_WS_ENGINE_3D) {
uint32_t obj_class = nouveau_ws_context_find_class(classes, 0x97);
ret = nouveau_ws_subchan_alloc(dev->fd, req.channel, base | 0x003d,
obj_class, &(*out)->eng3d);
obj_class, &ctx->eng3d);
if (ret)
goto fail_subchan;
}
@ -175,7 +171,7 @@ nouveau_ws_context_create(struct nouveau_ws_device *dev,
if (!obj_class)
obj_class = nouveau_ws_context_find_class(classes, 0x39);
ret = nouveau_ws_subchan_alloc(dev->fd, req.channel, base | 0x323f,
obj_class, &(*out)->m2mf);
obj_class, &ctx->m2mf);
if (ret)
goto fail_subchan;
}
@ -183,27 +179,48 @@ nouveau_ws_context_create(struct nouveau_ws_device *dev,
if (engines & NOUVEAU_WS_ENGINE_COMPUTE) {
uint32_t obj_class = nouveau_ws_context_find_class(classes, 0xc0);
ret = nouveau_ws_subchan_alloc(dev->fd, req.channel, base | 0x00c0,
obj_class, &(*out)->compute);
obj_class, &ctx->compute);
if (ret)
goto fail_subchan;
}
(*out)->channel = req.channel;
(*out)->dev = dev;
ctx->channel = req.channel;
return 0;
fail_subchan:
nouveau_ws_subchan_dealloc(dev->fd, &(*out)->compute);
nouveau_ws_subchan_dealloc(dev->fd, &(*out)->eng3d);
nouveau_ws_subchan_dealloc(dev->fd, &(*out)->copy);
nouveau_ws_subchan_dealloc(dev->fd, &(*out)->m2mf);
nouveau_ws_subchan_dealloc(dev->fd, &(*out)->eng2d);
nouveau_ws_subchan_dealloc(dev->fd, &ctx->compute);
nouveau_ws_subchan_dealloc(dev->fd, &ctx->eng3d);
nouveau_ws_subchan_dealloc(dev->fd, &ctx->copy);
nouveau_ws_subchan_dealloc(dev->fd, &ctx->m2mf);
nouveau_ws_subchan_dealloc(dev->fd, &ctx->eng2d);
nouveau_ws_channel_dealloc(dev->fd, req.channel);
fail_alloc:
FREE(*out);
return ret;
}
int
nouveau_ws_context_create(struct nouveau_ws_device *dev,
enum nouveau_ws_engines engines,
struct nouveau_ws_context **out)
{
struct nouveau_ws_context *ctx = CALLOC_STRUCT(nouveau_ws_context);
if (ctx == NULL)
return -ENOMEM;
ctx->dev = dev;
int ret = nouveau_ws_3d_context_init(dev, ctx, engines);
if (ret != 0) {
FREE(ctx);
return ret;
}
*out = ctx;
return 0;
}
void
nouveau_ws_context_destroy(struct nouveau_ws_context *context)
{