From 68a1e7e6723b69601ba69f4a64308509156b1163 Mon Sep 17 00:00:00 2001 From: Yue Hin Lau Date: Thu, 26 Oct 2017 11:29:54 -0400 Subject: [PATCH 2702/4131] 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 --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- 2 files changed, 3 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 b1c9ba2..23c4573 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 e2dc834..0bdf069 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); } -- 2.7.4