drm/amd/display: Added dc_edp_id_count to dc_context

[Why]
We need to keep track of the number of eDP links to
properly enumerate edp panel control instance.

[How]
Added dc_edp_id_count to dc_context to keep track of
number of eDP links.

Signed-off-by: Jake Wang <haonan.wang2@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 719fc6b502b6ded46475e46ecb774180237c0247..b2b6e26f160a9f6740099bc3bba495634b4418ec 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -1386,8 +1386,6 @@ static bool dc_link_construct(struct dc_link *link,
        struct dc_bios *bios = init_params->dc->ctx->dc_bios;
        const struct dc_vbios_funcs *bp_funcs = bios->funcs;
        struct bp_disp_connector_caps_info disp_connect_caps_info = { 0 };
-       struct dc_link *edp_links[MAX_NUM_EDP];
-       int edp_num;
 
        DC_LOGGER_INIT(dc_ctx->logger);
 
@@ -1513,14 +1511,12 @@ static bool dc_link_construct(struct dc_link *link,
                (link->link_id.id == CONNECTOR_ID_EDP ||
                        link->link_id.id == CONNECTOR_ID_LVDS)) {
                panel_cntl_init_data.ctx = dc_ctx;
-               get_edp_links(panel_cntl_init_data.ctx->dc, edp_links, &edp_num);
-               if ((edp_num > 1) && (link->link_index > edp_links[0]->link_index))
-                       panel_cntl_init_data.inst = 1;
-               else
-                       panel_cntl_init_data.inst = 0;
+               panel_cntl_init_data.inst =
+                       panel_cntl_init_data.ctx->dc_edp_id_count;
                link->panel_cntl =
                        link->dc->res_pool->funcs->panel_cntl_create(
                                                                &panel_cntl_init_data);
+               panel_cntl_init_data.ctx->dc_edp_id_count++;
 
                if (link->panel_cntl == NULL) {
                        DC_ERROR("Failed to create link panel_cntl!\n");

diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index d8912a4de3b108480546b1d39795692ba4490bcb..432754eaf10b8815aa33d26d18689dcafe8a7b3b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -113,6 +113,7 @@ struct dc_context {
        struct gpio_service *gpio_service;
        uint32_t dc_sink_id_count;
        uint32_t dc_stream_id_count;
+       uint32_t dc_edp_id_count;
        uint64_t fbc_gpu_addr;
        struct dc_dmub_srv *dmub_srv;