Skip to content

Commit de5d7a8

Browse files
Samson Tamalexdeucher
authored andcommitted
drm/amd/display: fix init_adj offset for cositing in SPL
[Why & How] init_adj offset is applied when cosited not interstitial Adjust cositing offset in SPL Reviewed-by: Jun Lei <[email protected]> Signed-off-by: Samson Tam <[email protected]> Signed-off-by: Roman Li <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent c7c703e commit de5d7a8

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ static const struct dc_debug_options debug_defaults_drv = {
737737
.enable_stall_recovery = true,
738738
}
739739
},
740-
.force_cositing = CHROMA_COSITING_TOPLEFT + 1,
740+
.force_cositing = CHROMA_COSITING_NONE + 1,
741741
};
742742

743743
static struct dce_aux *dcn401_aux_engine_create(

drivers/gpu/drm/amd/display/dc/spl/dc_spl.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -633,20 +633,21 @@ static void spl_calculate_inits_and_viewports(struct spl_in *spl_in,
633633

634634
switch (spl_in->basic_in.cositing) {
635635

636-
case CHROMA_COSITING_LEFT:
637-
init_adj_h = spl_fixpt_zero;
636+
case CHROMA_COSITING_TOPLEFT:
637+
init_adj_h = spl_fixpt_from_fraction(sign, 4);
638638
init_adj_v = spl_fixpt_from_fraction(sign, 4);
639639
break;
640-
case CHROMA_COSITING_NONE:
640+
case CHROMA_COSITING_LEFT:
641641
init_adj_h = spl_fixpt_from_fraction(sign, 4);
642-
init_adj_v = spl_fixpt_from_fraction(sign, 4);
642+
init_adj_v = spl_fixpt_zero;
643643
break;
644-
case CHROMA_COSITING_TOPLEFT:
644+
case CHROMA_COSITING_NONE:
645645
default:
646646
init_adj_h = spl_fixpt_zero;
647647
init_adj_v = spl_fixpt_zero;
648648
break;
649649
}
650+
650651
}
651652

652653
spl_calculate_init_and_vp(

0 commit comments

Comments
 (0)