Commit e2e316d5 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: correctly initialize dml odm variables 



One of odm variables was not initialized in dml.

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarChris Park <Chris.Park@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Acked-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b6bfba6c

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,7 @@ bool dcn20_fast_validate_bw( 
	return out;

}



void dcn20_calculate_wm(

static void dcn20_calculate_wm(

		struct dc *dc, struct dc_state *context,

		display_e2e_pipe_params_st *pipes,

		int *out_pipe_cnt,

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

+0 −6
Original line number Diff line number Diff line
@@ -150,12 +150,6 @@ void dcn20_calculate_dlg_params( 
		display_e2e_pipe_params_st *pipes,

		int pipe_cnt,

		int vlevel);

void dcn20_calculate_wm(

		struct dc *dc, struct dc_state *context,

		display_e2e_pipe_params_st *pipes,

		int *out_pipe_cnt,

		int *pipe_split_from,

		int vlevel);



enum dc_status dcn20_build_mapped_resource(const struct dc *dc, struct dc_state *context, struct dc_stream_state *stream);

enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx, struct dc_stream_state *dc_stream);

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c

+2 −0
Original line number Diff line number Diff line
@@ -432,6 +432,8 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) 
				dst->recout_width; // TODO: or should this be full_recout_width???...maybe only when in hsplit mode?

		mode_lib->vba.ODMCombineEnabled[mode_lib->vba.NumberOfActivePlanes] =

				dst->odm_combine;

		mode_lib->vba.ODMCombineTypeEnabled[mode_lib->vba.NumberOfActivePlanes] =

				dst->odm_combine;

		mode_lib->vba.OutputFormat[mode_lib->vba.NumberOfActivePlanes] =

				(enum output_format_class) (dout->output_format);

		mode_lib->vba.OutputBpp[mode_lib->vba.NumberOfActivePlanes] =