Commit f0c4d997 authored by Corbin McElhanney's avatar Corbin McElhanney Committed by Alex Deucher
Browse files

drm/amd/display: fix HDMI 12bits last two bits are zero issue 



(FF-158) -[FF N-1] HDMI Deep Color Mode incorrect bit depth:
FMT_DYNAMIC_EXP_EN is being reset to 0

Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 233dcd20

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+11 −6
Original line number Diff line number Diff line
@@ -1044,14 +1044,14 @@ static enum dc_status apply_single_controller_ctx_to_hw( 
	/*  */

	dc->hwss.prog_pixclk_crtc_otg(pipe_ctx, context, dc);



	/* FPGA does not program backend */

	if (IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment)) {

		pipe_ctx->stream_res.opp->funcs->opp_set_dyn_expansion(

		pipe_ctx->stream_res.opp,

		COLOR_SPACE_YCBCR601,

		stream->timing.display_color_depth,

		pipe_ctx->stream->signal);



	/* FPGA does not program backend */

	if (IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment)) {

	pipe_ctx->stream_res.opp->funcs->opp_program_fmt(

			pipe_ctx->stream_res.opp,

			&stream->bit_depth_params,
@@ -1064,6 +1064,11 @@ static enum dc_status apply_single_controller_ctx_to_hw( 
			BREAK_TO_DEBUGGER();

			return DC_ERROR_UNEXPECTED;

		}

	pipe_ctx->stream_res.opp->funcs->opp_set_dyn_expansion(

			pipe_ctx->stream_res.opp,

			COLOR_SPACE_YCBCR601,

			stream->timing.display_color_depth,

			pipe_ctx->stream->signal);



	if (pipe_ctx->stream->signal != SIGNAL_TYPE_VIRTUAL)

		stream->sink->link->link_enc->funcs->setup(

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ static void oppn10_set_dyn_expansion( 
	/*01 - 8-bit  -> 12-bit dynamic expansion*/

	if (signal == SIGNAL_TYPE_HDMI_TYPE_A ||

		signal == SIGNAL_TYPE_DISPLAY_PORT ||

		signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {

		signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||

		signal == SIGNAL_TYPE_VIRTUAL) {

		switch (color_dpth) {

		case COLOR_DEPTH_888:

			REG_UPDATE_2(FMT_DYNAMIC_EXP_CNTL,