Commit 5ca40959 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: add userq firmware version checks 



Currently disabled until the firmwares are officially
released.

Reviewed-by: default avatarPrike Liang <Prike.Liang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f36e4876

drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c

+10 −4
Original line number Diff line number Diff line
@@ -1623,8 +1623,11 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block) 
		adev->gfx.mec.num_pipe_per_mec = 4;

		adev->gfx.mec.num_queue_per_pipe = 4;

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

		/* add firmware version checks here */

		if (0) {

			adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;

			adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;

		}

#endif

		break;

	case IP_VERSION(11, 0, 1):
@@ -1640,8 +1643,11 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block) 
		adev->gfx.mec.num_pipe_per_mec = 4;

		adev->gfx.mec.num_queue_per_pipe = 4;

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

		/* add firmware version checks here */

		if (0) {

			adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;

			adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;

		}

#endif

		break;

	default:

drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c

+5 −2
Original line number Diff line number Diff line
@@ -1420,8 +1420,11 @@ static int gfx_v12_0_sw_init(struct amdgpu_ip_block *ip_block) 
		adev->gfx.mec.num_pipe_per_mec = 2;

		adev->gfx.mec.num_queue_per_pipe = 4;

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

		/* add firmware version checks here */

		if (0) {

			adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;

			adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;

		}

#endif

		break;

	default:

drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c

+3 −1
Original line number Diff line number Diff line
@@ -1381,6 +1381,8 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block) 
		DRM_ERROR("Failed to allocated memory for SDMA IP Dump\n");



#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

	/* add firmware version checks here */

	if (0)

		adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;

#endif

	r = amdgpu_sdma_sysfs_reset_mask_init(adev);

drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c

+3 −1
Original line number Diff line number Diff line
@@ -1383,6 +1383,8 @@ static int sdma_v7_0_sw_init(struct amdgpu_ip_block *ip_block) 
		DRM_ERROR("Failed to allocated memory for SDMA IP Dump\n");



#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ

	/* add firmware version checks here */

	if (0)

		adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;

#endif