From ae234355baf95a311327eb3873cd3b692b7833ec Mon Sep 17 00:00:00 2001 From: jsg Date: Sun, 25 Feb 2024 23:57:35 +0000 Subject: [PATCH] drm/amd: Don't init MEC2 firmware when it fails to load From David McFarland 38fd4dfa2764280e48c862e89623def321d0328d in linux-6.6.y/6.6.18 8ef85a0ce24a6d9322dfa2a67477e473c3619b4f in mainline linux --- sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c b/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c index 8e9e703199b..a0bf45202d5 100644 --- a/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c @@ -4020,8 +4020,6 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) err = 0; adev->gfx.mec2_fw = NULL; } - amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2); - amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2_JT); gfx_v10_0_check_fw_write_wait(adev); out: -- 2.20.1