summarylogtreecommitdiffstats
path: root/0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch
diff options
context:
space:
mode:
authorErik Kurzinger2020-01-29 12:05:50 -0800
committerErik Kurzinger2020-01-29 12:05:50 -0800
commit4663bfed711768b751c00a04e336290aee62b340 (patch)
tree59797ee46de9c0b9804b4043f7aca0b63a6e4bc7 /0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch
parentf821989f042dbf89593a8344624fe0672fbbddb8 (diff)
downloadaur-4663bfed711768b751c00a04e336290aee62b340.tar.gz
Update to Weston 8.0.0
Diffstat (limited to '0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch')
-rw-r--r--0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch15
1 files changed, 7 insertions, 8 deletions
diff --git a/0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch b/0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch
index 118f9498d4f3..e2089e965e10 100644
--- a/0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch
+++ b/0004-backend-drm-Gracefully-handle-vblank-and-flip-invali.patch
@@ -1,9 +1,8 @@
-From f664250b469b329189aef308ce9a65e06a851242 Mon Sep 17 00:00:00 2001
+From 0ed7d25672cf8a2e16f84e336568970e069e0930 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 4/8] backend-drm: Gracefully handle vblank and flip invalid
+Subject: [PATCH 4/6] backend-drm: Gracefully handle vblank and flip invalid
timestamps
-X-NVConfidentiality: public
Instant query for vblank timestamp may always fail, resulting in
never scheduling a full repaint in drm_output_start_repaint_loop().
@@ -22,7 +21,7 @@ Reviewed-by: Andy Ritger <aritger@nvidia.com>
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
-index 041a15a5..e631ffb9 100644
+index e0b1cbd7..bbce70e5 100644
--- a/libweston/backend-drm/drm.c
+++ b/libweston/backend-drm/drm.c
@@ -4,6 +4,7 @@
@@ -33,7 +32,7 @@ index 041a15a5..e631ffb9 100644
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
-@@ -268,6 +269,19 @@ drm_output_update_complete(struct drm_output *output, uint32_t flags,
+@@ -318,6 +319,19 @@ drm_output_update_complete(struct drm_output *output, uint32_t flags,
ts.tv_sec = sec;
ts.tv_nsec = usec * 1000;
@@ -53,7 +52,7 @@ index 041a15a5..e631ffb9 100644
weston_output_finish_frame(&output->base, &ts, flags);
/* We can't call this from frame_notify, because the output's
-@@ -501,8 +515,16 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
+@@ -525,8 +539,16 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
vbl.request.type |= drm_waitvblank_pipe(output);
ret = drmWaitVBlank(backend->drm.fd, &vbl);
@@ -72,7 +71,7 @@ index 041a15a5..e631ffb9 100644
ts.tv_sec = vbl.reply.tval_sec;
ts.tv_nsec = vbl.reply.tval_usec * 1000;
-@@ -523,7 +545,7 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
+@@ -547,7 +569,7 @@ drm_output_start_repaint_loop(struct weston_output *output_base)
}
}
@@ -82,5 +81,5 @@ index 041a15a5..e631ffb9 100644
*/
--
-2.21.0
+2.20.1