summarylogtreecommitdiffstats
path: root/0010-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch
diff options
context:
space:
mode:
Diffstat (limited to '0010-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch')
-rw-r--r--0010-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/0010-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch b/0010-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch
index b294073b906..1a9de4173f9 100644
--- a/0010-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch
+++ b/0010-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch
@@ -1,4 +1,4 @@
-From 8e93cad203be5983ea01fdd4a1b044465c3b8ac0 Mon Sep 17 00:00:00 2001
+From 3aabc17a3b83d255d3a2fd2f597746af20c9647e Mon Sep 17 00:00:00 2001
From: "Miguel A. Vico" <mvicomoya@nvidia.com>
Date: Tue, 1 Mar 2016 22:19:14 +0100
Subject: [PATCH 10/11] compositor-drm: Gracefully handle vblank and flip
@@ -17,14 +17,16 @@ situations above.
Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
+
+[aplattner@nvidia.com: rebased on top of Weston 1.12.0]
---
- src/compositor-drm.c | 26 +++++++++++++++++++++++---
+ libweston/compositor-drm.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
-diff --git a/src/compositor-drm.c b/src/compositor-drm.c
-index dd545de1ccc0..51d90e1d6437 100644
---- a/src/compositor-drm.c
-+++ b/src/compositor-drm.c
+diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
+index 888881880e16..d1cb21c6b37a 100644
+--- a/libweston/compositor-drm.c
++++ b/libweston/compositor-drm.c
@@ -1,6 +1,7 @@
/*
* Copyright © 2008-2011 Kristian Høgsberg
@@ -33,7 +35,7 @@ index dd545de1ccc0..51d90e1d6437 100644
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
-@@ -753,8 +754,16 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
+@@ -799,8 +800,16 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
vbl.request.type |= drm_waitvblank_pipe(output);
ret = drmWaitVBlank(backend->drm.fd, &vbl);
@@ -52,7 +54,7 @@ index dd545de1ccc0..51d90e1d6437 100644
ts.tv_sec = vbl.reply.tval_sec;
ts.tv_nsec = vbl.reply.tval_usec * 1000;
-@@ -775,7 +784,7 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
+@@ -821,7 +830,7 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
}
}
@@ -61,7 +63,7 @@ index dd545de1ccc0..51d90e1d6437 100644
* Use pageflip fallback.
*/
fb_id = output->current->fb_id;
-@@ -861,6 +870,17 @@ page_flip_handler(int fd, unsigned int frame,
+@@ -907,6 +916,17 @@ page_flip_handler(int fd, unsigned int frame,
else if (!output->vblank_pending) {
ts.tv_sec = sec;
ts.tv_nsec = usec * 1000;
@@ -80,5 +82,5 @@ index dd545de1ccc0..51d90e1d6437 100644
/* We can't call this from frame_notify, because the output's
--
-2.8.3
+2.10.0