Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 06:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/nvif: remove client device arg

Browse Source 
This was once used by userspace tools (with nvkm built as a library), as
a way to select a "default device".

The DRM code doesn't need this at all as clients only have access to a
single device already, so inherit the value from its parent.

Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-20-bskeggs@nvidia.com
This commit is contained in:
Ben Skeggs 2024-07-26 14:38:10 +10:00 committed by Danilo Krummrich
parent 7e0d8de4d3
commit a897f65b3a
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/include/nvif/client.h
View File

@ -10,8 +10,7 @@ struct nvif_client {
u64 version;
};
int nvif_client_ctor(struct nvif_client *parent, const char *name, u64 device,
struct nvif_client *);
int nvif_client_ctor(struct nvif_client *parent, const char *name, struct nvif_client *);
void nvif_client_dtor(struct nvif_client *);
int nvif_client_ioctl(struct nvif_client *, void *, u32);
int nvif_client_suspend(struct nvif_client *);

1
drivers/gpu/drm/nouveau/include/nvif/if0000.h
View File

@ -5,7 +5,6 @@
struct nvif_client_v0 {
__u8 version;
__u8 pad01[7];
__u64 device;
char name[32];
};

4
drivers/gpu/drm/nouveau/nouveau_drm.c
View File

@ -241,7 +241,6 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
{ NVIF_CLASS_VMM_NV04 , -1 },
{}
};
u64 device = nouveau_name(drm->dev);
int ret;
snprintf(cli->name, sizeof(cli->name), "%s", sname);
@ -254,8 +253,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
if (cli != &drm->master) {
mutex_lock(&drm->master.lock);
ret = nvif_client_ctor(&drm->master.base, cli->name, device,
&cli->base);
ret = nvif_client_ctor(&drm->master.base, cli->name, &cli->base);
mutex_unlock(&drm->master.lock);
}
if (ret) {

5
drivers/gpu/drm/nouveau/nvif/client.c
View File

@ -55,10 +55,9 @@ nvif_client_dtor(struct nvif_client *client)
}
int
nvif_client_ctor(struct nvif_client *parent, const char *name, u64 device,
struct nvif_client *client)
nvif_client_ctor(struct nvif_client *parent, const char *name, struct nvif_client *client)
{
struct nvif_client_v0 args = { .device = device };
struct nvif_client_v0 args = {};
struct {
struct nvif_ioctl_v0 ioctl;
struct nvif_ioctl_nop_v0 nop;

2
drivers/gpu/drm/nouveau/nvif/driver.c
View File

@ -36,5 +36,5 @@ nvif_driver_init(const char *drv, const char *cfg, const char *dbg,
if (ret)
return ret;
return nvif_client_ctor(client, name, device, client);
return nvif_client_ctor(client, name, client);
}

2
drivers/gpu/drm/nouveau/nvkm/core/client.c
View File

@ -42,7 +42,7 @@ nvkm_uclient_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
if (!(ret = nvif_unpack(ret, &argv, &argc, args->v0, 0, 0, false))){
args->v0.name[sizeof(args->v0.name) - 1] = 0;
ret = nvkm_client_new(args->v0.name, args->v0.device, NULL,
ret = nvkm_client_new(args->v0.name, oclass->client->device, NULL,
NULL, oclass->client->event, &client);
if (ret)
return ret;