diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3632-drm-amd-display-Check-DCN-PState-ASSERT-failure.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3632-drm-amd-display-Check-DCN-PState-ASSERT-failure.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3632-drm-amd-display-Check-DCN-PState-ASSERT-failure.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3632-drm-amd-display-Check-DCN-PState-ASSERT-failure.patch new file mode 100644 index 00000000..605f4f27 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3632-drm-amd-display-Check-DCN-PState-ASSERT-failure.patch @@ -0,0 +1,70 @@ +From 9cd300cdca116a5a8647a299b4053b31d719df96 Mon Sep 17 00:00:00 2001 +From: Hersen Wu <hersenxs.wu@amd.com> +Date: Tue, 13 Feb 2018 16:23:12 -0500 +Subject: [PATCH 3632/4131] drm/amd/display: Check DCN PState ASSERT failure + +[Description] ASIC change debug register definition + +Signed-off-by: Hersen Wu <hersenxs.wu@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 9 ++++++--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 1 + + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +index eb83171..f984583 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +@@ -100,7 +100,6 @@ bool hubbub1_verify_allow_pstate_change_high( + static unsigned int max_sampled_pstate_wait_us; /* data collection */ + static bool forced_pstate_allow; /* help with revert wa */ + +- unsigned int debug_index = 0x7; + unsigned int debug_data; + unsigned int i; + +@@ -115,7 +114,9 @@ bool hubbub1_verify_allow_pstate_change_high( + forced_pstate_allow = false; + } + +- /* description "3-0: Pipe0 cursor0 QOS ++ /* RV1: ++ * dchubbubdebugind, at: 0x7 ++ * description "3-0: Pipe0 cursor0 QOS + * 7-4: Pipe1 cursor0 QOS + * 11-8: Pipe2 cursor0 QOS + * 15-12: Pipe3 cursor0 QOS +@@ -137,7 +138,8 @@ bool hubbub1_verify_allow_pstate_change_high( + * 31: SOC pstate change request + */ + +- REG_WRITE(DCHUBBUB_TEST_DEBUG_INDEX, debug_index); ++ ++ REG_WRITE(DCHUBBUB_TEST_DEBUG_INDEX, hubbub->debug_test_index_pstate); + + for (i = 0; i < pstate_wait_timeout_us; i++) { + debug_data = REG_READ(DCHUBBUB_TEST_DEBUG_DATA); +@@ -512,5 +514,6 @@ void hubbub1_construct(struct hubbub *hubbub, + hubbub->shifts = hubbub_shift; + hubbub->masks = hubbub_mask; + ++ hubbub->debug_test_index_pstate = 0x7; + } + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h +index d5c9784..a16e908 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h +@@ -185,6 +185,7 @@ struct hubbub { + const struct dcn_hubbub_registers *regs; + const struct dcn_hubbub_shift *shifts; + const struct dcn_hubbub_mask *masks; ++ unsigned int debug_test_index_pstate; + }; + + void hubbub1_update_dchub( +-- +2.7.4 + |