aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.19.8/1066-Revert-drm-amd-display-Signal-hw_done-after-waiting-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1066-Revert-drm-amd-display-Signal-hw_done-after-waiting-.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.19.8/1066-Revert-drm-amd-display-Signal-hw_done-after-waiting-.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1066-Revert-drm-amd-display-Signal-hw_done-after-waiting-.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1066-Revert-drm-amd-display-Signal-hw_done-after-waiting-.patch
new file mode 100644
index 00000000..e57e73cb
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1066-Revert-drm-amd-display-Signal-hw_done-after-waiting-.patch
@@ -0,0 +1,48 @@
+From 332501a688c7551c51893139519d56e120171288 Mon Sep 17 00:00:00 2001
+From: Leo Li <sunpeng.li@amd.com>
+Date: Mon, 7 Jan 2019 13:28:54 -0500
+Subject: [PATCH 1066/2940] Revert "drm/amd/display: Signal hw_done() after
+ waiting for flip_done()"
+
+This reverts commit 717276b9256f5d97b43e53adca1670cee2c45db2.
+
+The reverted patch was a workaround that addressed an issue fixed by:
+4364bcb2cd21 ("drm: Get ref on CRTC commit object when waiting for
+flip_done")
+
+Signed-off-by: Leo Li <sunpeng.li@amd.com>
+Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Chaudhary Amit Kumar <Chaudharyamit.Kumar@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+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 c588abe75dd7..20cf05adecca 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -5290,18 +5290,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
+ }
+ spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
+
++ /* Signal HW programming completion */
++ drm_atomic_helper_commit_hw_done(state);
+
+ if (wait_for_vblank)
+ drm_atomic_helper_wait_for_flip_done(dev, state);
+
+- /*
+- * FIXME:
+- * Delay hw_done() until flip_done() is signaled. This is to block
+- * another commit from freeing the CRTC state while we're still
+- * waiting on flip_done.
+- */
+- drm_atomic_helper_commit_hw_done(state);
+-
+ drm_atomic_helper_cleanup_planes(dev, state);
+
+ /* Finally, drop a runtime PM reference for each newly disabled CRTC,
+--
+2.17.1
+