From: Yue Hin Lau Date: Thu, 26 Oct 2017 15:29:54 +0000 (-0400) Subject: drm/amd/display: hubbub function flipping true and false X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~6030^2~29^2~184 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e70fe3b1f06fb12c5fb181c06bab745d0bad3fa5;p=mirror_ubuntu-focal-kernel.git drm/amd/display: hubbub function flipping true and false no logic change Signed-off-by: Yue Hin Lau Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- 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 b1c9ba241ba4..23c4573f7a34 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c @@ -139,7 +139,7 @@ bool hubbub1_verify_allow_pstate_change_high( "pstate took longer than expected ~%dus\n", i); - return false; + return true; } if (max_sampled_pstate_wait_us < i) max_sampled_pstate_wait_us = i; @@ -159,7 +159,7 @@ bool hubbub1_verify_allow_pstate_change_high( "pstate TEST_DEBUG_DATA: 0x%X\n", debug_data); - return true; + return false; } static uint32_t convert_and_clamp( diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index fe236a9fd147..90f1f54ade61 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -548,7 +548,7 @@ void dcn10_verify_allow_pstate_change_high(struct dc *dc) { static bool should_log_hw_state; /* prevent hw state log by default */ - if (hubbub1_verify_allow_pstate_change_high(dc->res_pool->hubbub)) { + if (!hubbub1_verify_allow_pstate_change_high(dc->res_pool->hubbub)) { if (should_log_hw_state) { dcn10_log_hw_state(dc); }