summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2024-02-25 23:57:36 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2024-02-25 23:57:36 +0000
commitb2cadd54d96d69d30a4e17cce46b3d1cbd78c136 (patch)
tree4a7b00770af28617907bbcc3da8ca32f069da892 /sys
parentb605889fcff8a578a9574ca53cf23b3ac02429df (diff)
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
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c2
1 files changed, 0 insertions, 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: