Skip to content

Commit 00812bf

Browse files
Nicholas Kazlauskasalexdeucher
authored andcommitted
drm/amd/display: Add debug option to skip PSR CRTC disable
[Why] It's currently tied to Z10 support, and is required for Z10, but we can still support Z10 display off without PSR. We currently need to skip the PSR CRTC disable to prevent stuttering and underflow from occuring during PSR-SU. [How] Add a debug option to allow specifying this separately. Reviewed-by: Robin Chen <[email protected]> Acked-by: Stylon Wang <[email protected]> Signed-off-by: Nicholas Kazlauskas <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 6f0bf2d commit 00812bf

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

drivers/gpu/drm/amd/display/dc/core/dc_link.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3378,7 +3378,7 @@ bool dc_link_setup_psr(struct dc_link *link,
33783378
case FAMILY_YELLOW_CARP:
33793379
case AMDGPU_FAMILY_GC_10_3_6:
33803380
case AMDGPU_FAMILY_GC_11_0_1:
3381-
if (dc->debug.disable_z10)
3381+
if (dc->debug.disable_z10 || dc->debug.psr_skip_crtc_disable)
33823382
psr_context->psr_level.bits.SKIP_CRTC_DISABLE = true;
33833383
break;
33843384
default:

drivers/gpu/drm/amd/display/dc/dc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,7 @@ struct dc_debug_options {
844844
int crb_alloc_policy_min_disp_count;
845845
bool disable_z10;
846846
bool enable_z9_disable_interface;
847+
bool psr_skip_crtc_disable;
847848
union dpia_debug_options dpia_debug;
848849
bool disable_fixed_vs_aux_timeout_wa;
849850
bool force_disable_subvp;

drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,7 @@ static const struct dc_plane_cap plane_cap = {
886886
static const struct dc_debug_options debug_defaults_drv = {
887887
.disable_z10 = false,
888888
.enable_z9_disable_interface = true,
889+
.psr_skip_crtc_disable = true,
889890
.disable_dmcu = true,
890891
.force_abm_enable = false,
891892
.timing_trace = false,

0 commit comments

Comments
 (0)