leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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-03-30 14:01:57 +10:00
parent 45faf3d7b6
commit 64a0f59ab1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/include/nvif/user.h
View File

@ -13,8 +13,8 @@ struct nvif_user_func {
u64 (*time)(struct nvif_user *); u64 (*time)(struct nvif_user *);
}; };
int nvif_user_init(struct nvif_device *); int nvif_user_ctor(struct nvif_device *, const char *name);
void nvif_user_fini(struct nvif_device *); void nvif_user_dtor(struct nvif_device *);
extern const struct nvif_user_func nvif_userc361; extern const struct nvif_user_func nvif_userc361;
#endif #endif

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

@ -483,7 +483,7 @@ nouveau_accel_init(struct nouveau_drm *drm)
/* Volta requires access to a doorbell register for kickoff. */ /* Volta requires access to a doorbell register for kickoff. */
if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_VOLTA) { if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_VOLTA) {
ret = nvif_user_init(device); ret = nvif_user_ctor(device, "drmUsermode");
if (ret) if (ret)
return; return;
} }

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

@ -41,7 +41,7 @@ nvif_device_time(struct nvif_device *device)
void void
nvif_device_dtor(struct nvif_device *device) nvif_device_dtor(struct nvif_device *device)
{ {
nvif_user_fini(device); nvif_user_dtor(device);
kfree(device->runlist); kfree(device->runlist);
device->runlist = NULL; device->runlist = NULL;
nvif_object_dtor(&device->object); nvif_object_dtor(&device->object);

6
drivers/gpu/drm/nouveau/nvif/user.c
View File

@ -25,7 +25,7 @@
#include <nvif/class.h> #include <nvif/class.h>
void void
nvif_user_fini(struct nvif_device *device) nvif_user_dtor(struct nvif_device *device)
{ {
if (device->user.func) { if (device->user.func) {
nvif_object_dtor(&device->user.object); nvif_object_dtor(&device->user.object);
@ -34,7 +34,7 @@ nvif_user_fini(struct nvif_device *device)
} }
int int
nvif_user_init(struct nvif_device *device) nvif_user_ctor(struct nvif_device *device, const char *name)
{ {
struct { struct {
s32 oclass; s32 oclass;
@ -53,7 +53,7 @@ nvif_user_init(struct nvif_device *device)
if (cid < 0) if (cid < 0)
return cid; return cid;
ret = nvif_object_ctor(&device->object, "nvifUsermode", ret = nvif_object_ctor(&device->object, name ? name : "nvifUsermode",
0, users[cid].oclass, NULL, 0, 0, users[cid].oclass, NULL, 0,
&device->user.object); &device->user.object);
if (ret) if (ret)