diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3830-drm-amd-pp-Fix-gfx-ring-test-failed-on-Fiji-without-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3830-drm-amd-pp-Fix-gfx-ring-test-failed-on-Fiji-without-.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3830-drm-amd-pp-Fix-gfx-ring-test-failed-on-Fiji-without-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3830-drm-amd-pp-Fix-gfx-ring-test-failed-on-Fiji-without-.patch new file mode 100644 index 00000000..8d112943 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3830-drm-amd-pp-Fix-gfx-ring-test-failed-on-Fiji-without-.patch @@ -0,0 +1,54 @@ +From 128b3a0dd76e1033da62c11cd91c9c6a620616b1 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Tue, 20 Mar 2018 17:04:46 +0800 +Subject: [PATCH 3830/4131] drm/amd/pp: Fix gfx ring test failed on Fiji + without hw avfs support + +caused by +'commit ca82cec868d1 ("drm/amd/pp: Simplified the avfs btc state on smu7")' + +Change-Id: If4e6ff2deffabe6f4a70ca4f3d41b9d615687c6f +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 3 +++ + drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 6 ++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +index 43432e4..faef783 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +@@ -263,6 +263,9 @@ static int fiji_setup_graphics_level_structure(struct pp_hwmgr *hwmgr) + + static int fiji_avfs_event_mgr(struct pp_hwmgr *hwmgr) + { ++ if (!hwmgr->avfs_supported) ++ return 0; ++ + PP_ASSERT_WITH_CODE(0 == fiji_setup_graphics_level_structure(hwmgr), + "[AVFS][fiji_avfs_event_mgr] Could not Copy Graphics Level" + " table over to SMU", +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +index f6b1298..997a777 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +@@ -172,11 +172,13 @@ static int polaris10_setup_graphics_level_structure(struct pp_hwmgr *hwmgr) + } + + +-static int +-polaris10_avfs_event_mgr(struct pp_hwmgr *hwmgr) ++static int polaris10_avfs_event_mgr(struct pp_hwmgr *hwmgr) + { + struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(hwmgr->smu_backend); + ++ if (!hwmgr->avfs_supported) ++ return 0; ++ + PP_ASSERT_WITH_CODE(0 == polaris10_setup_graphics_level_structure(hwmgr), + "[AVFS][Polaris10_AVFSEventMgr] Could not Copy Graphics Level table over to SMU", + return -EINVAL); +-- +2.7.4 + |