aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1004-drm-amd-display-Safe-stream-encoder-id-in-stream_sta.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1004-drm-amd-display-Safe-stream-encoder-id-in-stream_sta.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1004-drm-amd-display-Safe-stream-encoder-id-in-stream_sta.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1004-drm-amd-display-Safe-stream-encoder-id-in-stream_sta.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1004-drm-amd-display-Safe-stream-encoder-id-in-stream_sta.patch
new file mode 100644
index 00000000..3bdfd609
--- /dev/null
+++ b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1004-drm-amd-display-Safe-stream-encoder-id-in-stream_sta.patch
@@ -0,0 +1,42 @@
+From ef4f813f314e0cc8d4963b0d96ef45ca5a9b4e0e Mon Sep 17 00:00:00 2001
+From: Wenjing Liu <Wenjing.Liu@amd.com>
+Date: Tue, 22 Aug 2017 18:42:51 -0400
+Subject: [PATCH 1004/4131] drm/amd/display: Safe stream encoder id in
+ stream_status
+
+Change-Id: Ic4773faafb39e3c3725c4d4a298c79eb44512c0d
+Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <Harry.Wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+index 90bf367..9415629 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+@@ -1599,6 +1599,7 @@ enum dc_status resource_map_pool_resources(
+ for (i = 0; i < context->stream_count; i++)
+ if (context->streams[i] == stream) {
+ context->stream_status[i].primary_otg_inst = pipe_ctx->stream_res.tg->inst;
++ context->stream_status[i].stream_enc_inst = pipe_ctx->stream_res.stream_enc->id;
+ return DC_OK;
+ }
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
+index acc326d..69bd67b 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc.h
++++ b/drivers/gpu/drm/amd/display/dc/dc.h
+@@ -526,6 +526,7 @@ enum surface_update_type {
+
+ struct dc_stream_status {
+ int primary_otg_inst;
++ int stream_enc_inst;
+ int plane_count;
+ struct dc_plane_state *plane_states[MAX_SURFACE_NUM];
+
+--
+2.7.4
+