tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: Switch to fdinfo helper
v2: Rebase on drm-misc-next
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230524155956.382440-5-robdclark@gmail.com
authored by
Rob Clark
and committed by
Neil Armstrong
376c25f8
51d86ee5
+18
-19
+2
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+2
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
···
2747
2747
.compat_ioctl = amdgpu_kms_compat_ioctl,
2748
2748
#endif
2749
2749
#ifdef CONFIG_PROC_FS
2750
-
.show_fdinfo = amdgpu_show_fdinfo
2750
+
.show_fdinfo = drm_show_fdinfo,
2751
2751
#endif
2752
2752
};
2753
2753
···
2802
2802
.dumb_map_offset = amdgpu_mode_dumb_mmap,
2803
2803
.fops = &amdgpu_driver_kms_fops,
2804
2804
.release = &amdgpu_driver_release_kms,
2805
+
.show_fdinfo = amdgpu_show_fdinfo,
2805
2806
2806
2807
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
2807
2808
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+15
-17
drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
+15
-17
drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
···
53
53
[AMDGPU_HW_IP_VCN_JPEG] = "jpeg",
54
54
};
55
55
56
-
void amdgpu_show_fdinfo(struct seq_file *m, struct file *f)
56
+
void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file)
57
57
{
58
-
struct drm_file *file = f->private_data;
59
58
struct amdgpu_device *adev = drm_to_adev(file->minor->dev);
60
59
struct amdgpu_fpriv *fpriv = file->driver_priv;
61
60
struct amdgpu_vm *vm = &fpriv->vm;
···
86
87
* ******************************************************************
87
88
*/
88
89
89
-
seq_printf(m, "pasid:\t%u\n", fpriv->vm.pasid);
90
-
seq_printf(m, "drm-driver:\t%s\n", file->minor->dev->driver->name);
91
-
seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n", domain, bus, dev, fn);
92
-
seq_printf(m, "drm-client-id:\t%Lu\n", vm->immediate.fence_context);
93
-
seq_printf(m, "drm-memory-vram:\t%llu KiB\n", stats.vram/1024UL);
94
-
seq_printf(m, "drm-memory-gtt: \t%llu KiB\n", stats.gtt/1024UL);
95
-
seq_printf(m, "drm-memory-cpu: \t%llu KiB\n", stats.cpu/1024UL);
96
-
seq_printf(m, "amd-memory-visible-vram:\t%llu KiB\n",
90
+
drm_printf(p, "pasid:\t%u\n", fpriv->vm.pasid);
91
+
drm_printf(p, "drm-driver:\t%s\n", file->minor->dev->driver->name);
92
+
drm_printf(p, "drm-pdev:\t%04x:%02x:%02x.%d\n", domain, bus, dev, fn);
93
+
drm_printf(p, "drm-client-id:\t%Lu\n", vm->immediate.fence_context);
94
+
drm_printf(p, "drm-memory-vram:\t%llu KiB\n", stats.vram/1024UL);
95
+
drm_printf(p, "drm-memory-gtt: \t%llu KiB\n", stats.gtt/1024UL);
96
+
drm_printf(p, "drm-memory-cpu: \t%llu KiB\n", stats.cpu/1024UL);
97
+
drm_printf(p, "amd-memory-visible-vram:\t%llu KiB\n",
97
98
stats.visible_vram/1024UL);
98
-
seq_printf(m, "amd-evicted-vram:\t%llu KiB\n",
99
+
drm_printf(p, "amd-evicted-vram:\t%llu KiB\n",
99
100
stats.evicted_vram/1024UL);
100
-
seq_printf(m, "amd-evicted-visible-vram:\t%llu KiB\n",
101
+
drm_printf(p, "amd-evicted-visible-vram:\t%llu KiB\n",
101
102
stats.evicted_visible_vram/1024UL);
102
-
seq_printf(m, "amd-requested-vram:\t%llu KiB\n",
103
+
drm_printf(p, "amd-requested-vram:\t%llu KiB\n",
103
104
stats.requested_vram/1024UL);
104
-
seq_printf(m, "amd-requested-visible-vram:\t%llu KiB\n",
105
+
drm_printf(p, "amd-requested-visible-vram:\t%llu KiB\n",
105
106
stats.requested_visible_vram/1024UL);
106
-
seq_printf(m, "amd-requested-gtt:\t%llu KiB\n",
107
+
drm_printf(p, "amd-requested-gtt:\t%llu KiB\n",
107
108
stats.requested_gtt/1024UL);
108
-
109
109
for (hw_ip = 0; hw_ip < AMDGPU_HW_IP_NUM; ++hw_ip) {
110
110
if (!usage[hw_ip])
111
111
continue;
112
112
113
-
seq_printf(m, "drm-engine-%s:\t%Ld ns\n", amdgpu_ip_name[hw_ip],
113
+
drm_printf(p, "drm-engine-%s:\t%Ld ns\n", amdgpu_ip_name[hw_ip],
114
114
ktime_to_ns(usage[hw_ip]));
115
115
}
116
116
}
+1
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
+1
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h