diff options
| author |   Awais Belal <awais_belal@mentor.com> | 2015-10-08 19:16:57 +0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:24:27 +0000 |
| commit | 64b5e3e0a2a8bb68d0ad54011d17d3fa39d2ff59 (patch) | |
| tree | 0b5f2e9322565ab75a7e4fb257ed2b657a0ef558 /meta/recipes-graphics/mesa/mesa-demos | |
| parent | dc8495fd1c1d73791619541a75cfc4ca2572e678 (diff) | |
| download | openembedded-core-contrib-64b5e3e0a2a8bb68d0ad54011d17d3fa39d2ff59.tar.gz | |
mesa-demos: fix deadlock in sharedtex_mt
This patch fixes a deadlock that occurs between the main
thread and rendering threads of the sharedtex_mt demo.
(From OE-Core rev: f3566af923a9559fa77c1fb0cd22557afb724835)
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-demos')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch b/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch new file mode 100644 index 0000000000..04e1b446f3 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch @@ -0,0 +1,43 @@ +From 525fa9ded72d22b53c5eb366f61e2ac1d407a2db Mon Sep 17 00:00:00 2001 +From: Awais Belal <awais_belal@mentor.com> +Date: Thu, 8 Oct 2015 13:49:31 +0500 +Subject: [PATCH] sharedtex_mt: fix rendering thread hang + +XNextEvent is a blocking call which locks up the display mutex +this causes the rendering threads to hang when they try call +glXSwapBuffers() as that tries to take the same mutex in +underlying calls through XCopyArea(). +So we only go to XNextEvent when it has at least one event +and we wouldn't lock indefinitely. + +Signed-off-by: Awais Belal <awais_belal@mentor.com> +Upstream-Status: Backport (2b304e765695d385fd3bf414e6e444020bedb0a8) + +--- + src/xdemos/sharedtex_mt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/xdemos/sharedtex_mt.c b/src/xdemos/sharedtex_mt.c +index a90903a..1d503c4 100644 +--- a/src/xdemos/sharedtex_mt.c ++++ b/src/xdemos/sharedtex_mt.c +@@ -420,9 +420,14 @@ Resize(struct window *h, unsigned int width, unsigned int height) + static void + EventLoop(void) + { ++ int i; ++ XEvent event; + while (1) { +- int i; +- XEvent event; ++ /* Do we have an event? */ ++ if (XPending(gDpy) == 0) { ++ usleep(10000); ++ continue; ++ } + XNextEvent(gDpy, &event); + for (i = 0; i < NumWindows; i++) { + struct window *h = &Windows[i]; +-- +1.9.1 + |