diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2917-drm-amdgpu-skip-load-cp-gfx-firmware-for-Arcturus.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2917-drm-amdgpu-skip-load-cp-gfx-firmware-for-Arcturus.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2917-drm-amdgpu-skip-load-cp-gfx-firmware-for-Arcturus.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2917-drm-amdgpu-skip-load-cp-gfx-firmware-for-Arcturus.patch new file mode 100644 index 00000000..b5934ac8 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2917-drm-amdgpu-skip-load-cp-gfx-firmware-for-Arcturus.patch @@ -0,0 +1,54 @@ +From 47e5ad67c1fd155f149837e6f3abac4228a955c0 Mon Sep 17 00:00:00 2001 +From: Le Ma <le.ma@amd.com> +Date: Tue, 18 Sep 2018 17:04:42 +0800 +Subject: [PATCH 2917/2940] drm/amdgpu: skip load cp gfx firmware for Arcturus + +Arcturus has no CPG component any more. + +Signed-off-by: Le Ma <le.ma@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +index 0e1caec68388..4a9ac02adfa4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -941,9 +941,12 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev) + BUG(); + } + +- r = gfx_v9_0_init_cp_gfx_microcode(adev, chip_name); +- if (r) +- return r; ++ /* No CPG in Arcturus */ ++ if (adev->asic_type != CHIP_ARCTURUS) { ++ 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); + if (r) +@@ -3319,10 +3322,12 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev) + gfx_v9_0_enable_gui_idle_interrupt(adev, false); + + if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) { +- /* legacy firmware loading */ +- r = gfx_v9_0_cp_gfx_load_microcode(adev); +- if (r) +- return r; ++ if (adev->asic_type != CHIP_ARCTURUS) { ++ /* legacy firmware loading */ ++ r = gfx_v9_0_cp_gfx_load_microcode(adev); ++ if (r) ++ return r; ++ } + + r = gfx_v9_0_cp_compute_load_microcode(adev); + if (r) +-- +2.17.1 + |