aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/1011-drm-amd-display-Use-DRM-provided-page-flip-flag.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1011-drm-amd-display-Use-DRM-provided-page-flip-flag.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/1011-drm-amd-display-Use-DRM-provided-page-flip-flag.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1011-drm-amd-display-Use-DRM-provided-page-flip-flag.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1011-drm-amd-display-Use-DRM-provided-page-flip-flag.patch
new file mode 100644
index 00000000..9c5c5bd6
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1011-drm-amd-display-Use-DRM-provided-page-flip-flag.patch
@@ -0,0 +1,52 @@
+From d6e0679170e15b9ad2f6ca9f3be88b164e796b2f Mon Sep 17 00:00:00 2001
+From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
+Date: Wed, 23 Aug 2017 16:54:03 -0400
+Subject: [PATCH 1011/4131] drm/amd/display: Use DRM provided page flip flag.
+
+Starting with 4.12 kernel DRM provides page flip flags so we
+don't need to have our own copy.
+
+Change-Id: I15d8db215001f887c47d16be82df04216f9265c3
+Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
+Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 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 edbf952..cc34bfc 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -4011,7 +4011,7 @@ static void amdgpu_dm_do_flip(
+ struct amdgpu_framebuffer *afb = to_amdgpu_framebuffer(fb);
+ struct amdgpu_bo *abo = gem_to_amdgpu_bo(afb->obj);
+ struct amdgpu_device *adev = crtc->dev->dev_private;
+- bool async_flip = (acrtc->flip_flags & DRM_MODE_PAGE_FLIP_ASYNC) != 0;
++ bool async_flip = (crtc->state->pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC) != 0;
+ struct dc_flip_addrs addr = { {0} };
+ /* TODO eliminate or rename surface_update */
+ struct dc_surface_update surface_updates[1] = { {0} };
+@@ -4143,7 +4143,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ * TODO Check if it's correct
+ */
+ *wait_for_vblank =
+- acrtc_attach->flip_flags & DRM_MODE_PAGE_FLIP_ASYNC ?
++ pcrtc->state->pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC ?
+ false : true;
+
+ /* TODO: Needs rework for multiplane flip */
+@@ -4154,11 +4154,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ crtc,
+ fb,
+ drm_crtc_vblank_count(crtc) + *wait_for_vblank);
+-
+- /*TODO BUG remove ASAP in 4.12 to avoid race between worker and flip IOCTL */
+-
+- /*clean up the flags for next usage*/
+- acrtc_attach->flip_flags = 0;
+ }
+
+ }
+--
+2.7.4
+