[PATCH v10 12/14] drm/amdgpu: enable SDMA-V6 usermode queues

[Christian König]

Am 02.05.24 um 18:31 schrieb Shashank Sharma:
> This patch does necessary modifications to enable the SDMA-v6
> usermode queues using the existing userqueue infrastructure.
>
> V9:  introduced this patch in the series
> V10: use header file instead of extern (Alex)
>
> Cc: Christian König <Christian.Koenig at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Shashank Sharma <shashank.sharma at amd.com>
> Signed-off-by: Arvind Yadav <arvind.yadav at amd.com>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c        | 2 ++
>   2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
> index df0e74a3ec8c..f7ece0b31ff9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
> @@ -189,7 +189,7 @@ amdgpu_userqueue_create(struct drm_file *filp, union drm_amdgpu_userq *args)
>   	int qid, r = 0;
>   
>   	/* Usermode queues are only supported for GFX/SDMA engines as of now */
> -	if (args->in.ip_type != AMDGPU_HW_IP_GFX) {
> +	if (args->in.ip_type != AMDGPU_HW_IP_GFX && args->in.ip_type != AMDGPU_HW_IP_DMA) {
>   		DRM_ERROR("Usermode queue doesn't support IP type %u\n", args->in.ip_type);
>   		return -EINVAL;
>   	}
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> index c833b6b8373b..0989400d0afe 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> @@ -43,6 +43,7 @@
>   #include "sdma_common.h"
>   #include "sdma_v6_0.h"
>   #include "v11_structs.h"
> +#include "mes_v11_0_userqueue.h"
>   
>   MODULE_FIRMWARE("amdgpu/sdma_6_0_0.bin");
>   MODULE_FIRMWARE("amdgpu/sdma_6_0_1.bin");
> @@ -1273,6 +1274,7 @@ static int sdma_v6_0_sw_init(void *handle)
>   		return -EINVAL;
>   	}
>   
> +	adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_v11_0_funcs;
>   	return r;
>   }
>