superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/nvif: give every device object a human-readable identifier 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
pull/496/merge
Ben Skeggs 2020-03-30 13:49:05 +10:00
parent 9ac596a4e8
commit bd21080eb6
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/include/nvif/device.h
View File

@ -18,9 +18,9 @@ struct nvif_device {
struct nvif_user user;
};
int nvif_device_init(struct nvif_object *, u32 handle, s32 oclass, void *, u32,
struct nvif_device *);
void nvif_device_fini(struct nvif_device *);
int nvif_device_ctor(struct nvif_object *, const char *name, u32 handle,
s32 oclass, void *, u32, struct nvif_device *);
void nvif_device_dtor(struct nvif_device *);
u64 nvif_device_time(struct nvif_device *);
/*XXX*/

6
drivers/gpu/drm/nouveau/nouveau_abi16.c
View File

@ -55,8 +55,8 @@ nouveau_abi16(struct drm_file *file_priv)
* device (ie. the one that belongs to the fd it
* opened)
*/
if (nvif_device_init(&cli->base.object, 0, NV_DEVICE,
&args, sizeof(args),
if (nvif_device_ctor(&cli->base.object, "abi16Device",
0, NV_DEVICE, &args, sizeof(args),
&abi16->device) == 0)
return cli->abi16;
@ -167,7 +167,7 @@ nouveau_abi16_fini(struct nouveau_abi16 *abi16)
}
/* destroy the device object */
nvif_device_fini(&abi16->device);
nvif_device_dtor(&abi16->device);
kfree(cli->abi16);
cli->abi16 = NULL;

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

@ -179,7 +179,7 @@ nouveau_cli_fini(struct nouveau_cli *cli)
nouveau_vmm_fini(&cli->svm);
nouveau_vmm_fini(&cli->vmm);
nvif_mmu_fini(&cli->mmu);
nvif_device_fini(&cli->device);
nvif_device_dtor(&cli->device);
mutex_lock(&cli->drm->master.lock);
nvif_client_dtor(&cli->base);
mutex_unlock(&cli->drm->master.lock);
@ -238,7 +238,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
goto done;
}
ret = nvif_device_init(&cli->base.object, 0, NV_DEVICE,
ret = nvif_device_ctor(&cli->base.object, "drmDevice", 0, NV_DEVICE,
&(struct nv_device_v0) {
.device = ~0,
}, sizeof(struct nv_device_v0),

8
drivers/gpu/drm/nouveau/nvif/device.c
View File

@ -39,7 +39,7 @@ nvif_device_time(struct nvif_device *device)
}
void
nvif_device_fini(struct nvif_device *device)
nvif_device_dtor(struct nvif_device *device)
{
nvif_user_fini(device);
kfree(device->runlist);
@ -48,10 +48,10 @@ nvif_device_fini(struct nvif_device *device)
}
int
nvif_device_init(struct nvif_object *parent, u32 handle, s32 oclass,
void *data, u32 size, struct nvif_device *device)
nvif_device_ctor(struct nvif_object *parent, const char *name, u32 handle,
s32 oclass, void *data, u32 size, struct nvif_device *device)
{
int ret = nvif_object_ctor(parent, "nvifDevice", handle,
int ret = nvif_object_ctor(parent, name ? name : "nvifDevice", handle,
oclass, data, size, &device->object);
device->runlist = NULL;
device->user.func = NULL;