aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2596-drm-amd-display-Fix-one-more-place-for-dc_stream_sta.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2596-drm-amd-display-Fix-one-more-place-for-dc_stream_sta.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2596-drm-amd-display-Fix-one-more-place-for-dc_stream_sta.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2596-drm-amd-display-Fix-one-more-place-for-dc_stream_sta.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2596-drm-amd-display-Fix-one-more-place-for-dc_stream_sta.patch
new file mode 100644
index 00000000..9dc9fc8a
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2596-drm-amd-display-Fix-one-more-place-for-dc_stream_sta.patch
@@ -0,0 +1,30 @@
+From 925170b93325ab17373d8ab9a5087b4384d4431e Mon Sep 17 00:00:00 2001
+From: Harry Wentland <harry.wentland@amd.com>
+Date: Tue, 12 Sep 2017 17:10:25 +0100
+Subject: [PATCH 2596/4131] drm/amd/display: Fix one more place for
+ dc_stream_state leak
+
+One more thing that happened due to uneven applying of patches. This
+mirrors what Darren Salt fixed.
+
+Signed-off-by: Harry Wentland <harry.wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 90f3178..4501321 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -4704,7 +4704,7 @@ static int dm_update_crtcs_state(struct dc *dc,
+ * TODO: need to dig out the root cause of that
+ */
+ if (!aconnector || (!aconnector->dc_sink && aconnector->mst_port))
+- continue;
++ goto next_crtc;
+
+ if (modereset_required(crtc_state))
+ goto next_crtc;
+--
+2.7.4
+