Commit 7a47c882 authored by Jimmy Kizito's avatar Jimmy Kizito Committed by Alex Deucher
Browse files

drm/amd/display: Initialise encoder assignment when initialising dc_state 



[Why]
Link encoder assignment tracking variables need to be (re)initialised
whenever dc_state is (re)initialised. Otherwise variables used for
dynamic encoder assignment (especially the link encoder availability
pool) are out of sync with dc_state and future encoder assignments are
invalid.

[How]
Initialise encoder assignment variables when creating new dc_state
resource.

Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarAnson Jacob <Anson.Jacob@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarJimmy Kizito <Jimmy.Kizito@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aadb06f9

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

+1 −4
Original line number Diff line number Diff line
@@ -1016,8 +1016,6 @@ static bool dc_construct(struct dc *dc, 
		goto fail;

	}



	dc_resource_state_construct(dc, dc->current_state);



	if (!create_links(dc, init_params->num_virtual_links))

		goto fail;
@@ -1027,8 +1025,7 @@ static bool dc_construct(struct dc *dc, 
	if (!create_link_encoders(dc))

		goto fail;



	/* Initialise DIG link encoder resource tracking variables. */

	link_enc_cfg_init(dc, dc->current_state);

	dc_resource_state_construct(dc, dc->current_state);



	return true;

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

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static struct link_encoder *get_link_enc_used_by_link( 
	return link_enc;

}

/* Clear all link encoder assignments. */

static void clear_enc_assignments(struct dc *dc, struct dc_state *state)

static void clear_enc_assignments(const struct dc *dc, struct dc_state *state)

{

	int i;
@@ -261,7 +261,7 @@ static void clear_enc_assignments(struct dc *dc, struct dc_state *state) 
}



void link_enc_cfg_init(

		struct dc *dc,

		const struct dc *dc,

		struct dc_state *state)

{

	clear_enc_assignments(dc, state);

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

+3 −0
Original line number Diff line number Diff line
@@ -2224,6 +2224,9 @@ void dc_resource_state_construct( 
		struct dc_state *dst_ctx)

{

	dst_ctx->clk_mgr = dc->clk_mgr;



	/* Initialise DIG link encoder resource tracking variables. */

	link_enc_cfg_init(dc, dst_ctx);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 * Initialise link encoder resource tracking.

 */

void link_enc_cfg_init(

		struct dc *dc,

		const struct dc *dc,

		struct dc_state *state);



/*