aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0386-drm-amd-display-fix-resume-hang-because-of-DP-short-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0386-drm-amd-display-fix-resume-hang-because-of-DP-short-.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0386-drm-amd-display-fix-resume-hang-because-of-DP-short-.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0386-drm-amd-display-fix-resume-hang-because-of-DP-short-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0386-drm-amd-display-fix-resume-hang-because-of-DP-short-.patch
new file mode 100644
index 00000000..bb57c64c
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0386-drm-amd-display-fix-resume-hang-because-of-DP-short-.patch
@@ -0,0 +1,47 @@
+From e17c149dea726f93d995fd84648cac1fb4713538 Mon Sep 17 00:00:00 2001
+From: Arindam Nath <arindam.nath@amd.com>
+Date: Wed, 26 Apr 2017 17:39:56 +0530
+Subject: [PATCH 0386/4131] drm/amd/display: fix resume hang because of DP
+ short pulse
+
+There is a hard hang observed during resume from S3 when
+the system receives a DP short pulse interrupt. This is
+because there are two code paths contending for GPIO
+access for AUX channel transactions. One such path is
+through amdgpu_dm_display_resume() function which is
+invoked from the regular system resume code path. The
+other path is through handle_hpd_rx_irq(), which is
+invoked in response to system receiving DP short pulse
+interrupt. handle_hpd_rx_irq() guards against conflicting
+GPIO access using hpd_lock, but the GPIO access from
+amdgpu_dm_display_resume() remains unguarded.
+
+This patch makes sure we use hpd_lock inside
+amdgpu_dm_display_resume() to avoid race conditions
+for GPIO access.
+
+Signed-off-by: Arindam Nath <arindam.nath@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+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 2ae541c..6d61766 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -580,9 +580,11 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev )
+ if (aconnector->mst_port)
+ continue;
+
++ mutex_lock(&aconnector->hpd_lock);
+ dc_link_detect(aconnector->dc_link, false);
+ aconnector->dc_sink = NULL;
+ amdgpu_dm_update_connector_after_detect(aconnector);
++ mutex_unlock(&aconnector->hpd_lock);
+ }
+
+ /* Force mode set in atomic comit */
+--
+2.7.4
+