Commit 60df5628 authored by Joshua Aberback's avatar Joshua Aberback Committed by Alex Deucher
Browse files

drm/amd/display: handle invalid connector indices 



[Why]
The function to count the number of valid connectors does not
guarantee that the first n indices are valid, only that there
exist n valid indices. When invalid indices are present, this
results in later valid connectors being missed, as processing
would end after checking n indices.

[How]
 - count valid indices separately from total indices examined
 - add explicit definition of MAX_LINKS

Reviewed-by: default avatarDillon Varone <dillon.varone@amd.com>
Acked-by: default avatarRoman Li <roman.li@amd.com>
Signed-off-by: default avatarJoshua Aberback <joshua.aberback@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8b2cb32c

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static void dcn2_notify_link_rate_change(struct clk_mgr *clk_mgr_base, struct dc 


	clk_mgr->cur_phyclk_req_table[link->link_index] = link->cur_link_settings.link_rate * LINK_RATE_REF_FREQ_IN_KHZ;



	for (i = 0; i < MAX_PIPES * 2; i++) {

	for (i = 0; i < MAX_LINKS; i++) {

		if (clk_mgr->cur_phyclk_req_table[i] > max_phyclk_req)

			max_phyclk_req = clk_mgr->cur_phyclk_req_table[i];

	}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void rn_notify_link_rate_change(struct clk_mgr *clk_mgr_base, struct dc_l 


	clk_mgr->cur_phyclk_req_table[link->link_index] = link->cur_link_settings.link_rate * LINK_RATE_REF_FREQ_IN_KHZ;



	for (i = 0; i < MAX_PIPES * 2; i++) {

	for (i = 0; i < MAX_LINKS; i++) {

		if (clk_mgr->cur_phyclk_req_table[i] > max_phyclk_req)

			max_phyclk_req = clk_mgr->cur_phyclk_req_table[i];

	}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static void dcn30_notify_link_rate_change(struct clk_mgr *clk_mgr_base, struct d 


	clk_mgr->cur_phyclk_req_table[link->link_index] = link->cur_link_settings.link_rate * LINK_RATE_REF_FREQ_IN_KHZ;



	for (i = 0; i < MAX_PIPES * 2; i++) {

	for (i = 0; i < MAX_LINKS; i++) {

		if (clk_mgr->cur_phyclk_req_table[i] > max_phyclk_req)

			max_phyclk_req = clk_mgr->cur_phyclk_req_table[i];

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -212,7 +212,8 @@ static bool create_links( 
		connectors_num,

		num_virtual_links);



	for (i = 0; i < connectors_num; i++) {

	// condition loop on link_count to allow skipping invalid indices

	for (i = 0; dc->link_count < connectors_num && i < MAX_LINKS; i++) {

		struct link_init_data link_init_params = {0};

		struct dc_link *link;

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

+1 −1
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ struct dc { 
	struct dc_phy_addr_space_config vm_pa_config;



	uint8_t link_count;

	struct dc_link *links[MAX_PIPES * 2];

	struct dc_link *links[MAX_LINKS];

	struct link_service *link_srv;



	struct dc_state *current_state;