Skip to contentSkip to conversation

sdl2: add patch to fix busy-loop in C library

PATCH New Paul Cercueil 3 participants 3 messages Dec 20, 2019 – Dec 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sdl2: add patch to fix busy-loop in C library

For some obscure reason, the order in which the libdrm/libgbm libraries are loaded matters.

Without this fix, the first call to check_modesetting() will work and load then unload all symbols properly, but the second call to this function will lock up as soon as dlopen() is called on libdrm.

Swapping the order in which the libdrm and libgbm libraries are loaded is enough to fix (or work around?) this issue.

---
 .../sdl2/0002-fix-busy-loop-in-dlopen.patch   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/sdl2/0002-fix-busy-loop-in-dlopen.patch
package/sdl2/0002-fix-busy-loop-in-dlopen.patch new file +37 -0
new file mode 100644
index 0000000000..984a80d9c1
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User Paul Cercueil <[email protected]>
+# Date 1576820863 28800
+# Node ID 4f5bef55183c677d12a7da8f3392879ed50670a3
+# Parent  01f16d7f36cb9f4fa02016e57fbe915fdea71cc8
+kmsdrm: Fix busy-loop within libc's dlopen()
+For some obscure reason, the order in which the libdrm/libgbm libraries
+are loaded matters.
+
+Without this fix, the first call to check_modesetting() will work and
+load then unload all symbols properly, but the second call to this
+function will lock up as soon as dlopen() is called on libdrm.
+
+Swapping the order in which the libdrm and libgbm libraries are loaded
+is enough to fix (or work around?) this issue.
+
+Fixes #4891:
+https://bugzilla.libsdl.org/show_bug.cgi?id=4891
+
+Signed-off-by: Paul Cercueil <[email protected]>
+
+diff -r 01f16d7f36cb -r 4f5bef55183c src/video/kmsdrm/SDL_kmsdrmdyn.c
+--- a/src/video/kmsdrm/SDL_kmsdrmdyn.c	Thu Dec 19 21:45:44 2019 -0800
++++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c	Thu Dec 19 21:47:43 2019 -0800
+@@ -50,8 +50,8 @@
+ #endif
+ 
+ static kmsdrmdynlib kmsdrmlibs[] = {
+-    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC},
+-    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM}
++    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM},
++    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC}
+ };
+ 
+ static void *
+
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 sdl2: add patch to fix busy-loop in C library

Paul, All,

On 2019-12-20 17:04 +0100, Paul Cercueil spake thusly:

Quoted 11 lines

For some obscure reason, the order in which the libdrm/libgbm libraries are loaded matters.

Without this fix, the first call to check_modesetting() will work and load then unload all symbols properly, but the second call to this function will lock up as soon as dlopen() is called on libdrm.

Swapping the order in which the libdrm and libgbm libraries are loaded is enough to fix (or work around?) this issue.

Applied to master, after adding a URL to the upstream commit. Thanks!

Regards,
Yann E. MORIN.

Quoted 55 lines
---
 .../sdl2/0002-fix-busy-loop-in-dlopen.patch   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/sdl2/0002-fix-busy-loop-in-dlopen.patch
package/sdl2/0002-fix-busy-loop-in-dlopen.patch new file +37 -0
new file mode 100644
index 0000000000..984a80d9c1
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User Paul Cercueil <[email protected]>
+# Date 1576820863 28800
+# Node ID 4f5bef55183c677d12a7da8f3392879ed50670a3
+# Parent  01f16d7f36cb9f4fa02016e57fbe915fdea71cc8
+kmsdrm: Fix busy-loop within libc's dlopen()
+For some obscure reason, the order in which the libdrm/libgbm libraries
+are loaded matters.
+
+Without this fix, the first call to check_modesetting() will work and
+load then unload all symbols properly, but the second call to this
+function will lock up as soon as dlopen() is called on libdrm.
+
+Swapping the order in which the libdrm and libgbm libraries are loaded
+is enough to fix (or work around?) this issue.
+
+Fixes #4891:
+https://bugzilla.libsdl.org/show_bug.cgi?id=4891
+
+Signed-off-by: Paul Cercueil <[email protected]>
+
+diff -r 01f16d7f36cb -r 4f5bef55183c src/video/kmsdrm/SDL_kmsdrmdyn.c
+--- a/src/video/kmsdrm/SDL_kmsdrmdyn.c	Thu Dec 19 21:45:44 2019 -0800
++++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c	Thu Dec 19 21:47:43 2019 -0800
+@@ -50,8 +50,8 @@
+ #endif
+ 
+ static kmsdrmdynlib kmsdrmlibs[] = {
+-    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC},
+-    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM}
++    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM},
++    {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC}
+ };
+ 
+ static void *
+
Signature · 6 lines
2.24.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 sdl2: add patch to fix busy-loop in C library

In reply to Paul Cercueil
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

For some obscure reason, the order in which the libdrm/libgbm libraries are loaded matters.

Quoted 8 lines

Without this fix, the first call to check_modesetting() will work and load then unload all symbols properly, but the second call to this function will lock up as soon as dlopen() is called on libdrm.

Swapping the order in which the libdrm and libgbm libraries are loaded is enough to fix (or work around?) this issue.

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard