Commit f8b733b9 authored by Le Ma's avatar Le Ma Committed by Alex Deucher

drm/amdgpu: skip load cp gfx firmware for Arcturus

Arcturus has no CPG component any more.
Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 24c44c89
...@@ -945,9 +945,12 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev) ...@@ -945,9 +945,12 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev)
BUG(); BUG();
} }
r = gfx_v9_0_init_cp_gfx_microcode(adev, chip_name); /* No CPG in Arcturus */
if (r) if (adev->asic_type != CHIP_ARCTURUS) {
return r; r = gfx_v9_0_init_cp_gfx_microcode(adev, chip_name);
if (r)
return r;
}
r = gfx_v9_0_init_rlc_microcode(adev, chip_name); r = gfx_v9_0_init_rlc_microcode(adev, chip_name);
if (r) if (r)
...@@ -3323,10 +3326,12 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev) ...@@ -3323,10 +3326,12 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev)
gfx_v9_0_enable_gui_idle_interrupt(adev, false); gfx_v9_0_enable_gui_idle_interrupt(adev, false);
if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) { if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
/* legacy firmware loading */ if (adev->asic_type != CHIP_ARCTURUS) {
r = gfx_v9_0_cp_gfx_load_microcode(adev); /* legacy firmware loading */
if (r) r = gfx_v9_0_cp_gfx_load_microcode(adev);
return r; if (r)
return r;
}
r = gfx_v9_0_cp_compute_load_microcode(adev); r = gfx_v9_0_cp_compute_load_microcode(adev);
if (r) if (r)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment