aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/0435-drm-amd-display-Fix-dcn10-cursor-set-position-hang.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0435-drm-amd-display-Fix-dcn10-cursor-set-position-hang.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/0435-drm-amd-display-Fix-dcn10-cursor-set-position-hang.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0435-drm-amd-display-Fix-dcn10-cursor-set-position-hang.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0435-drm-amd-display-Fix-dcn10-cursor-set-position-hang.patch
new file mode 100644
index 00000000..cb4d0f59
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0435-drm-amd-display-Fix-dcn10-cursor-set-position-hang.patch
@@ -0,0 +1,42 @@
+From 824673a3b91f87f1f582353f7f45eab7578b13cd Mon Sep 17 00:00:00 2001
+From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
+Date: Tue, 16 May 2017 09:55:20 -0400
+Subject: [PATCH 0435/4131] drm/amd/display: Fix dcn10 cursor set position hang
+
+Calling dcn10_cursor_set_position() before dcn10_cursor_set_attributes()
+with invalid (0-value) attributes can cause the ASIC to hang. This fix
+checks that address.quadpart is non-zero within set_position before calling
+set_attributes.
+
+Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
+Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c
+index 3062b7d..082c98c 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c
+@@ -614,6 +614,16 @@ static void dcn10_cursor_set_position(
+ uint32_t cur_en = pos->enable ? 1 : 0;
+ uint32_t dst_x_offset = (src_x_offset >= 0) ? src_x_offset : 0;
+
++ /*
++ * Guard aganst cursor_set_position() from being called with invalid
++ * attributes
++ *
++ * TODO: Look at combining cursor_set_position() and
++ * cursor_set_attributes() into cursor_update()
++ */
++ if (ippn10->curs_attr.address.quad_part == 0)
++ return;
++
+ dst_x_offset *= param->ref_clk_khz;
+ dst_x_offset /= param->pixel_clk_khz;
+
+--
+2.7.4
+