Commit ff518e13 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu/mes11: adjust mes initialization sequence 



Adjust mes queue initialization before kgq/kcq initialization
to enable mes mapping legacy queue.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 486eb6b5

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

+8 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ MODULE_FIRMWARE("amdgpu/gc_11_5_0_mes1.bin"); 
MODULE_FIRMWARE("amdgpu/gc_11_5_1_mes_2.bin");

MODULE_FIRMWARE("amdgpu/gc_11_5_1_mes1.bin");





static int mes_v11_0_hw_init(void *handle);

static int mes_v11_0_hw_fini(void *handle);

static int mes_v11_0_kiq_hw_init(struct amdgpu_device *adev);

static int mes_v11_0_kiq_hw_fini(struct amdgpu_device *adev);
@@ -1292,6 +1292,10 @@ static int mes_v11_0_kiq_hw_init(struct amdgpu_device *adev) 
	if (r)

		goto failure;



	r = mes_v11_0_hw_init(adev);

	if (r)

		goto failure;



	return r;



failure:
@@ -1321,6 +1325,9 @@ static int mes_v11_0_hw_init(void *handle) 
	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (adev->mes.ring.sched.ready)

		return 0;



	if (!adev->enable_mes_kiq) {

		if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {

			r = mes_v11_0_load_microcode(adev,