Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce3f6e82 authored by Alvin lee's avatar Alvin lee Committed by Alex Deucher
Browse files

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



Signed-off-by: default avatarAlvin lee <alvin.lee3@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 74167ad6

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

+1 −0
Original line number Diff line number Diff line
@@ -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();

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

+4 −0
Original line number Diff line number Diff line
@@ -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;

}

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

+5 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −0
Original line number Diff line number Diff line
@@ -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;

};