Skip to content

Commit 0b43312

Browse files
Yang Wangalexdeucher
authored andcommitted
drm/amdgpu: fixing rlc firmware loading failure issue
Skip rlc firmware validation to ignore firmware header size mismatch issues. This restores the workaround added in commit 849e133 ("drm/amdgpu: Fix the null pointer when load rlc firmware") Fixes: 3af2c80 ("drm/amdgpu: refine gfx10 firmware loading") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3551 Signed-off-by: Yang Wang <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit 89ec85d)
1 parent fee9d13 commit 0b43312

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4116,6 +4116,7 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev)
41164116

41174117
static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
41184118
{
4119+
char fw_name[53];
41194120
char ucode_prefix[30];
41204121
const char *wks = "";
41214122
int err;
@@ -4149,8 +4150,8 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
41494150
amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_CE);
41504151

41514152
if (!amdgpu_sriov_vf(adev)) {
4152-
err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw,
4153-
"amdgpu/%s_rlc.bin", ucode_prefix);
4153+
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", ucode_prefix);
4154+
err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
41544155
if (err)
41554156
goto out;
41564157

0 commit comments

Comments
 (0)