Commit 99579c55 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/mes: add compatibility checks for set_hw_resource_1 

Seems some older MES firmware versions do not properly support
this packet.  Add back some the compatibility checks.

v2: switch to fw version check (Shaoyun)

Fixes: f81cd793 ("drm/amd/amdgpu: Fix MES init sequence")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4295


Cc: Shaoyun Liu <shaoyun.liu@amd.com>
Reviewed-by: default avatarshaoyun.liu <shaoyun.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 0180e0a5)
Cc: stable@vger.kernel.org
parent 0043ec26

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

+6 −4
Original line number Diff line number Diff line
@@ -1630,11 +1630,13 @@ static int mes_v11_0_hw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		goto failure;



	if ((adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x50) {

		r = mes_v11_0_set_hw_resources_1(&adev->mes);

		if (r) {

			DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);

			goto failure;

		}

	}



	r = mes_v11_0_query_sched_status(&adev->mes);

	if (r) {

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

+2 −1
Original line number Diff line number Diff line
@@ -1742,6 +1742,7 @@ static int mes_v12_0_hw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		goto failure;



	if ((adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x4b)

		mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_SCHED_PIPE);



	mes_v12_0_init_aggregated_doorbell(&adev->mes);