diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4741-drm-amd-display-create-sink_id-in-dc_sink-structure-.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4741-drm-amd-display-create-sink_id-in-dc_sink-structure-.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4741-drm-amd-display-create-sink_id-in-dc_sink-structure-.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4741-drm-amd-display-create-sink_id-in-dc_sink-structure-.patch new file mode 100644 index 00000000..554552f3 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4741-drm-amd-display-create-sink_id-in-dc_sink-structure-.patch @@ -0,0 +1,78 @@ +From 5a00ad09adddcab065c1006de3aa3ec034b59a5d Mon Sep 17 00:00:00 2001 +From: Alvin lee <alvin.lee3@amd.com> +Date: Fri, 18 May 2018 14:14:38 -0400 +Subject: [PATCH 4741/5725] 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> +--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 4 ++++ + drivers/gpu/drm/amd/display/dc/dc.h | 6 +++++- + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + 4 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index 7da1e88..16ebdc1 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -479,6 +479,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 25fae38..9971b51 100644 +--- 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 7cd4d5e..56c1e2b 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -679,9 +679,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 40d620f..9467249 100644 +--- 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; + }; + +-- +2.7.4 + |