[PATCH] drm/amdgpu: Fix for MEC SJT FW Load Fail on VF

[Zhang, Hawking]

[AMD Official Use Only - AMD Internal Distribution Only]

Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>

Regards,
Hawking
-----Original Message-----
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Yuan Feng
Sent: Friday, December 27, 2024 12:44
To: amd-gfx at lists.freedesktop.org
Cc: Feng, Yuan <Yuan.Feng at amd.com>
Subject: [PATCH] drm/amdgpu: Fix for MEC SJT FW Load Fail on VF

From: yfeng1 <yfeng1 at amd.com>

Users might switch to ROCM build does not include MEC SJT FW and driver needs to consider this case.w

Signed-off-by: yfeng1 <yfeng1 at amd.com>
Change-Id: I6803818450bcfcc9d912c80ad351824be7a9694c
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index a5bdcaf7a081..2ba185875baa 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -579,11 +579,16 @@ static int gfx_v9_4_3_init_cp_compute_microcode(struct amdgpu_device *adev,  {
        int err;

-       if (amdgpu_sriov_vf(adev))
+       if (amdgpu_sriov_vf(adev)) {
                err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,
                                           AMDGPU_UCODE_REQUIRED,
                                           "amdgpu/%s_sjt_mec.bin", chip_name);
-       else
+
+               if (err)
+                       err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,
+                                                       AMDGPU_UCODE_REQUIRED,
+                                                       "amdgpu/%s_mec.bin", chip_name);
+       } else
                err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,
                                           AMDGPU_UCODE_REQUIRED,
                                           "amdgpu/%s_mec.bin", chip_name);
--
2.34.1