On 08.07.25 12:15, Sunil Khatri wrote:
> Fix undefined reference to amdgpu_mqd_info_fops during
> debugfs_create_file if DEBUG_FS=n
>
> Signed-off-by: Sunil Khatri <sunil.kha...@amd.com>
Yeah, that's exactly the reason why I wanted to put this into amdgpu_debugfs.c.
For now Reviewed-by: Christian König <christian.koe...@amd.com>, but we should
clean that up at some point.
Going to push the patch to drm-misc-next now.
Regards,
Christian.
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> index 115d53bc9a8d..b1b80efc7993 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> @@ -319,8 +319,9 @@ amdgpu_userq_destroy(struct drm_file *filp, int queue_id)
> }
> amdgpu_bo_unref(&queue->db_obj.obj);
>
> +#if defined(CONFIG_DEBUG_FS)
> debugfs_remove_recursive(queue->debugfs_queue);
> -
> +#endif
> r = amdgpu_userq_unmap_helper(uq_mgr, queue);
> amdgpu_userq_cleanup(uq_mgr, queue, queue_id);
> mutex_unlock(&uq_mgr->userq_mutex);
> @@ -523,9 +524,11 @@ amdgpu_userq_create(struct drm_file *filp, union
> drm_amdgpu_userq *args)
> if (!queue_name)
> return -ENOMEM;
>
> +#if defined(CONFIG_DEBUG_FS)
> /* Queue dentry per client to hold MQD information */
> queue->debugfs_queue = debugfs_create_dir(queue_name,
> filp->debugfs_client);
> debugfs_create_file("mqd_info", 0444, queue->debugfs_queue, queue,
> &amdgpu_mqd_info_fops);
> +#endif
> kfree(queue_name);
>
> args->out.queue_id = qid;
