drm/amd/display: create sink_id in dc_sink structure to idenitify all sinks

Signed-off-by: Alvin lee <alvin.lee3@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 2c05630e78fb55bb4bc0418d0e468e7e13107efc..53ce7fa864b4f6173a8989223e3b77c1ab06a61b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -481,6 +481,7 @@ static bool construct(struct dc *dc,
        dc_ctx->driver_context = init_params->driver;
        dc_ctx->dc = dc;
        dc_ctx->asic_id = init_params->asic_id;
+       dc_ctx->dc_sink_id_count = 0;
        dc->ctx = dc_ctx;
 
        dc->current_state = dc_create_state();

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
index 25fae38409aba5f72b0ced6458ea1ef3481e7f13..9971b515c3eb3d81f95a0b6d9bee85e7f29b2267 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c
@@ -53,6 +53,10 @@ static bool construct(struct dc_sink *sink, const struct dc_sink_init_data *init
        sink->dongle_max_pix_clk = init_params->dongle_max_pix_clk;
        sink->converter_disable_audio = init_params->converter_disable_audio;
        sink->dc_container_id = NULL;
+       sink->sink_id = init_params->link->ctx->dc_sink_id_count;
+       // increment dc_sink_id_count because we don't want two sinks with same ID
+       // unless they are actually the same
+       init_params->link->ctx->dc_sink_id_count++;
 
        return true;
 }

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 9954d0eadfbca4441938ad4a2633ae37a42d4458..7ebce7669eea5d36ade68fea01d0279364b3857a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -666,9 +666,13 @@ struct dc_sink {
        struct dc_link *link;
        struct dc_context *ctx;
 
+       uint32_t sink_id;
+
        /* private to dc_sink.c */
+       // refcount must be the last member in dc_sink, since we want the
+       // sink structure to be logically cloneable up to (but not including)
+       // refcount
        struct kref refcount;
-
 };
 
 void dc_sink_retain(struct dc_sink *sink);

diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index e026ce5ac78fd4b2dd4fe31a845675b3f949bc08..c96e526d07bb6c23f720d839ba4b0648ef3bb00c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -92,6 +92,7 @@ struct dc_context {
        bool created_bios;
        struct gpio_service *gpio_service;
        struct i2caux *i2caux;
+       uint32_t dc_sink_id_count;
        uint64_t fbc_gpu_addr;
 };