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

drm/amd/amdgpu: introduce gc_*_mes_2.bin v2 



To avoid new mes fw running with old driver, rename
mes schq fw to gc_*_mes_2.bin.

v2: add MODULE_FIRMWARE declaration
v3: squash in fixup patch

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 980d5bae

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

+22 −4
Original line number Diff line number Diff line
@@ -1434,13 +1434,31 @@ int amdgpu_mes_init_microcode(struct amdgpu_device *adev, int pipe) 
	struct amdgpu_firmware_info *info;

	char ucode_prefix[30];

	char fw_name[40];

	bool need_retry = false;

	int r;



	amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix));

	amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix,

				       sizeof(ucode_prefix));

	if (adev->ip_versions[GC_HWIP][0] >= IP_VERSION(11, 0, 0)) {

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes%s.bin",

			 ucode_prefix,

			 pipe == AMDGPU_MES_SCHED_PIPE ? "_2" : "1");

		need_retry = true;

	} else {

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes%s.bin",

			 ucode_prefix,

			 pipe == AMDGPU_MES_SCHED_PIPE ? "" : "1");

	}



	r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe], fw_name);

	if (r && need_retry && pipe == AMDGPU_MES_SCHED_PIPE) {

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes.bin",

			 ucode_prefix);

		DRM_INFO("try to fall back to %s\n", fw_name);

		r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe],

					 fw_name);

	}



	if (r)

		goto out;

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

+5 −5
Original line number Diff line number Diff line
@@ -32,15 +32,15 @@ 
#include "v11_structs.h"

#include "mes_v11_api_def.h"



MODULE_FIRMWARE("amdgpu/gc_11_0_0_mes.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_0_mes_2.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_0_mes1.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_1_mes.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_1_mes_2.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_1_mes1.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_2_mes.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_2_mes_2.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_2_mes1.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_3_mes.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_3_mes_2.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_3_mes1.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_4_mes.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_4_mes_2.bin");

MODULE_FIRMWARE("amdgpu/gc_11_0_4_mes1.bin");



static int mes_v11_0_hw_fini(void *handle);