diff options
| author | Jack Xiao <Jack.Xiao@amd.com> | 2024-03-01 16:51:40 +0800 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2024-05-02 16:18:13 -0400 | 
| commit | 15ddc4e6931b747b5d241a4e61dbd4d4b95c8360 (patch) | |
| tree | 40750e57bf9b034f8394d358883cde78f5132ad4 /drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | |
| parent | 628e1ace23796d74a34d85833a60dd0d20ecbdb7 (diff) | |
drm/amdgpu/mes: add uni_mes fw loading support
Add the unified mes firmware loading support.
Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c index ea06f8be133e..62edf6328566 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c @@ -1511,7 +1511,10 @@ int amdgpu_mes_init_microcode(struct amdgpu_device *adev, int pipe)  	amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix,  				       sizeof(ucode_prefix)); -	if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(11, 0, 0) && +	if (adev->enable_uni_mes && pipe == AMDGPU_MES_SCHED_PIPE) { +		snprintf(fw_name, sizeof(fw_name), +			 "amdgpu/%s_uni_mes.bin", ucode_prefix); +	} else if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(11, 0, 0) &&  	    amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(12, 0, 0)) {  		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes%s.bin",  			 ucode_prefix,  | 
