aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2019-05-01 00:16:12 +0500
committerAwais Belal <awais_belal@mentor.com>2019-05-01 00:16:34 +0500
commit3f590b5f0b899cd39e013e33fecb40c9a6440d6e (patch)
tree6dcef76cb778ee9fda7a1d41ab25851c28413363
parent2ad5c20436453b3d452a31b91211e6e303867ee6 (diff)
downloadmeta-amd-3f590b5f0b899cd39e013e33fecb40c9a6440d6e.tar.gz
meta-amd-3f590b5f0b899cd39e013e33fecb40c9a6440d6e.tar.bz2
meta-amd-3f590b5f0b899cd39e013e33fecb40c9a6440d6e.zip
r1000/mesa: update for GA release
Signed-off-by: Chaudhary Amit Kumar <Chaudharyamit.Kumar@amd.com> Signed-off-by: Awais Belal <awais_belal@mentor.com>
-rw-r--r--meta-r1000/recipes-graphics/mesa/files/0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch72
-rw-r--r--meta-r1000/recipes-graphics/mesa/mesa_git.bbappend9
2 files changed, 80 insertions, 1 deletions
diff --git a/meta-r1000/recipes-graphics/mesa/files/0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch b/meta-r1000/recipes-graphics/mesa/files/0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch
new file mode 100644
index 00000000..e487d420
--- /dev/null
+++ b/meta-r1000/recipes-graphics/mesa/files/0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch
@@ -0,0 +1,72 @@
+From fa10114debafb2058789047704dbe2b21ce8df7e Mon Sep 17 00:00:00 2001
+From: Leo Liu <leo.liu@amd.com>
+Date: Tue, 19 Mar 2019 13:37:39 -0400
+Subject: [PATCH] vl/dri3: remove the wait before getting back buffer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The wait here is unnecessary since we got a pool of back buffers,
+and the wait for swap buffer will happen before the present pixmap,
+at the same time the previous back buffer will be put back to pool
+for reuse after the check for PresentIdleNotify event
+
+Signed-off-by: Leo Liu <leo.liu@amd.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+ src/gallium/auxiliary/vl/vl_winsys_dri3.c | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
+index 152d28e59fc..1558d832555 100644
+--- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c
++++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
+@@ -88,7 +88,6 @@ struct vl_dri3_screen
+ uint64_t send_sbc, recv_sbc;
+ int64_t last_ust, ns_frame, last_msc, next_msc;
+
+- bool flushed;
+ bool is_different_gpu;
+ };
+
+@@ -570,11 +569,9 @@ vl_dri3_flush_frontbuffer(struct pipe_screen *screen,
+ if (!back)
+ return;
+
+- if (scrn->flushed) {
+- while (scrn->special_event && scrn->recv_sbc < scrn->send_sbc)
+- if (!dri3_wait_present_events(scrn))
+- return;
+- }
++ while (scrn->special_event && scrn->recv_sbc < scrn->send_sbc)
++ if (!dri3_wait_present_events(scrn))
++ return;
+
+ rectangle.x = 0;
+ rectangle.y = 0;
+@@ -610,8 +607,6 @@ vl_dri3_flush_frontbuffer(struct pipe_screen *screen,
+
+ xcb_flush(scrn->conn);
+
+- scrn->flushed = true;
+-
+ return;
+ }
+
+@@ -626,13 +621,6 @@ vl_dri3_screen_texture_from_drawable(struct vl_screen *vscreen, void *drawable)
+ if (!dri3_set_drawable(scrn, (Drawable)drawable))
+ return NULL;
+
+- if (scrn->flushed) {
+- while (scrn->special_event && scrn->recv_sbc < scrn->send_sbc)
+- if (!dri3_wait_present_events(scrn))
+- return NULL;
+- }
+- scrn->flushed = false;
+-
+ buffer = (scrn->is_pixmap) ?
+ dri3_get_front_buffer(scrn) :
+ dri3_get_back_buffer(scrn);
+--
+2.17.1
+
diff --git a/meta-r1000/recipes-graphics/mesa/mesa_git.bbappend b/meta-r1000/recipes-graphics/mesa/mesa_git.bbappend
index 5211be22..81e55bc7 100644
--- a/meta-r1000/recipes-graphics/mesa/mesa_git.bbappend
+++ b/meta-r1000/recipes-graphics/mesa/mesa_git.bbappend
@@ -1 +1,8 @@
-PACKAGECONFIG_append_r1000 = " dri3" \ No newline at end of file
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRCREV_r1000 = "d2c170eb355a912586cb982858faac2fc85c4783"
+
+SRC_URI_remove_r1000 = "file://0001-gallium-add-missing-PIPE_CAP_SURFACE_SAMPLE_COUNT-de.patch"
+SRC_URI_append_r1000 = " file://0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch"
+
+PACKAGECONFIG_append_r1000 = " dri3"