Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_drv.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 999d008b6b484dbb208a9fe25dd99beacc27d60f..3b711babd4e2e5e49e650952675e56e42c81e016 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2791,7 +2791,7 @@ static const struct file_operations amdgpu_driver_kms_fops = {
        .compat_ioctl = amdgpu_kms_compat_ioctl,
 #endif
 #ifdef CONFIG_PROC_FS
-       .show_fdinfo = amdgpu_show_fdinfo
+       .show_fdinfo = drm_show_fdinfo,
 #endif
 };
 
@@ -2846,6 +2846,9 @@ static const struct drm_driver amdgpu_kms_driver = {
        .dumb_map_offset = amdgpu_mode_dumb_mmap,
        .fops = &amdgpu_driver_kms_fops,
        .release = &amdgpu_driver_release_kms,
+#ifdef CONFIG_PROC_FS
+       .show_fdinfo = amdgpu_show_fdinfo,
+#endif
 
        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
        .prime_fd_to_handle = drm_gem_prime_fd_to_handle,