Skip to contentSkip to conversation

glmark2: Fix segmentation fault

PATCH New Fabio Estevam 3 participants 3 messages Jun 13, 2017 – Jun 25, 2017

lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/1 glmark2: Fix segmentation fault

Running glmark2 on imx6 with kernel 4.11.4 and Mesa 17.1.2 leads to a segmentation fault.

Apply Lucas Stach's patch to fix the problem while upstream glmark2 doesn't get fixed.

Signed-off-by Fabio Estevam <[email protected]>
---
 ...eStateDRM-use-fixed-event-context-version.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/glmark2/0002-NativeStateDRM-use-fixed-event-context-version.patch
package/glmark2/0002-NativeStateDRM-use-fixed-event-context-version.patch new file +28 -0
new file mode 100644
index 0000000..c66f409
@@ -0,0 +1,28 @@
+From: Lucas Stach <[email protected]>
+Date: Wed, 31 May 2017 13:01:00 +0200
+Subject: [PATCH] NativeStateDRM: use fixed event context version
+
+Using the latest version is not a good idea, as the context content may
+change between versions.
+
+Fixes a segfault with new kernel and libdrm.
+
+Signed-off-by: Lucas Stach <[email protected]>
+Signed-off-by: Fabio Estevam <[email protected]>
+---
+ src/native-state-drm.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp
+index 454a24d898ff..b9af996667dc 100644
+--- a/src/native-state-drm.cpp
++++ b/src/native-state-drm.cpp
+@@ -106,7 +106,7 @@ NativeStateDRM::flip()
+     FD_ZERO(&fds);
+     FD_SET(fd_, &fds);
+     drmEventContext evCtx;
+-    evCtx.version = DRM_EVENT_CONTEXT_VERSION;
++    evCtx.version = 2;
+     evCtx.page_flip_handler = page_flip_handler;
+ 
+     while (waiting) {
Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH 1/1 glmark2: Fix segmentation fault

Hello,

Quoted 11 lines · Fabio Estevam

Running glmark2 on imx6 with kernel 4.11.4 and Mesa 17.1.2 leads to a segmentation fault.

Apply Lucas Stach's patch to fix the problem while upstream glmark2 doesn't get fixed.

Signed-off-by Fabio Estevam <[email protected]>
---
 ...eStateDRM-use-fixed-event-context-version.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/glmark2/0002-NativeStateDRM-use-fixed-event-context-version.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 glmark2: Fix segmentation fault

In reply to Fabio Estevam
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabio" == Fabio Estevam <[email protected]> writes:

Running glmark2 on imx6 with kernel 4.11.4 and Mesa 17.1.2 leads to a segmentation fault.

Apply Lucas Stach's patch to fix the problem while upstream glmark2 doesn't get fixed.

Signed-off-by Fabio Estevam <[email protected]>

Committed to 2017.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard