aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0096-drm-amd-display-Fixed-crash.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0096-drm-amd-display-Fixed-crash.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0096-drm-amd-display-Fixed-crash.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0096-drm-amd-display-Fixed-crash.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0096-drm-amd-display-Fixed-crash.patch
new file mode 100644
index 00000000..3872088e
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0096-drm-amd-display-Fixed-crash.patch
@@ -0,0 +1,50 @@
+From 6996b58ca5836674b54d205b663e7ba40491a14f Mon Sep 17 00:00:00 2001
+From: Yongqiang Sun <yongqiang.sun@amd.com>
+Date: Wed, 21 Dec 2016 16:48:51 -0500
+Subject: [PATCH 0096/4131] drm/amd/display: Fixed crash
+
+Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@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 | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 891075e..e6010ab 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -167,24 +167,20 @@ static bool stream_adjust_vmin_vmax(struct dc *dc,
+ struct core_stream *core_stream = DC_STREAM_TO_CORE(stream[0]);
+ int i = 0;
+ bool ret = false;
+- struct pipe_ctx *pipes;
+- unsigned int underlay_idx = core_dc->res_pool->underlay_pipe_index;
+
+ for (i = 0; i < MAX_PIPES; i++) {
+- if (core_dc->current_context->res_ctx.pipe_ctx[i].stream == core_stream
+- && i != underlay_idx) {
++ struct pipe_ctx *pipe = &core_dc->current_context->res_ctx.pipe_ctx[i];
+
+- pipes = &core_dc->current_context->res_ctx.pipe_ctx[i];
+- core_dc->hwss.set_drr(&pipes, 1, vmin, vmax);
++ if (pipe->stream == core_stream && pipe->stream_enc) {
++ core_dc->hwss.set_drr(&pipe, 1, vmin, vmax);
+
+ /* build and update the info frame */
+- resource_build_info_frame(pipes);
+- core_dc->hwss.update_info_frame(pipes);
++ resource_build_info_frame(pipe);
++ core_dc->hwss.update_info_frame(pipe);
+
+ ret = true;
+ }
+ }
+-
+ return ret;
+ }
+
+--
+2.7.4
+