diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2020-03-30 14:01:57 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:50:51 +1000 |
| commit | 64a0f59ab12467ace3e86b98ca47255827049d02 (patch) | |
| tree | a063829b110961a74896fc2732952da4b9611b3d /drivers/gpu/drm/nouveau/nvif | |
| parent | drm/nouveau/nvif: give every vmm object a human-readable identifier (diff) | |
| download | linux-dev-64a0f59ab12467ace3e86b98ca47255827049d02.tar.xz linux-dev-64a0f59ab12467ace3e86b98ca47255827049d02.zip | |
drm/nouveau/nvif: give every usermode object a human-readable identifier
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvif')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvif/device.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvif/user.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvif/device.c b/drivers/gpu/drm/nouveau/nvif/device.c index a3aebf865931..8c3d883f3313 100644 --- a/drivers/gpu/drm/nouveau/nvif/device.c +++ b/drivers/gpu/drm/nouveau/nvif/device.c @@ -41,7 +41,7 @@ nvif_device_time(struct nvif_device *device) void nvif_device_dtor(struct nvif_device *device) { - nvif_user_fini(device); + nvif_user_dtor(device); kfree(device->runlist); device->runlist = NULL; nvif_object_dtor(&device->object); diff --git a/drivers/gpu/drm/nouveau/nvif/user.c b/drivers/gpu/drm/nouveau/nvif/user.c index 490fd18d02c0..d89f5b67b304 100644 --- a/drivers/gpu/drm/nouveau/nvif/user.c +++ b/drivers/gpu/drm/nouveau/nvif/user.c @@ -25,7 +25,7 @@ #include <nvif/class.h> void -nvif_user_fini(struct nvif_device *device) +nvif_user_dtor(struct nvif_device *device) { if (device->user.func) { nvif_object_dtor(&device->user.object); @@ -34,7 +34,7 @@ nvif_user_fini(struct nvif_device *device) } int -nvif_user_init(struct nvif_device *device) +nvif_user_ctor(struct nvif_device *device, const char *name) { struct { s32 oclass; @@ -53,7 +53,7 @@ nvif_user_init(struct nvif_device *device) if (cid < 0) return cid; - ret = nvif_object_ctor(&device->object, "nvifUsermode", + ret = nvif_object_ctor(&device->object, name ? name : "nvifUsermode", 0, users[cid].oclass, NULL, 0, &device->user.object); if (ret) |