| Message ID | 1497393603-16151-1-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Tue, 13 Jun 2017 19:40:03 -0300, Fabio Estevam wrote: > 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 <festevam@gmail.com> > --- > ...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
>>>>> "Fabio" == Fabio Estevam <festevam@gmail.com> 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 <festevam@gmail.com> Committed to 2017.05.x, thanks.
diff --git a/package/glmark2/0002-NativeStateDRM-use-fixed-event-context-version.patch b/package/glmark2/0002-NativeStateDRM-use-fixed-event-context-version.patch new file mode 100644 index 0000000..c66f409 --- /dev/null +++ b/package/glmark2/0002-NativeStateDRM-use-fixed-event-context-version.patch @@ -0,0 +1,28 @@ +From: Lucas Stach <l.stach@pengutronix.de> +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 <l.stach@pengutronix.de> +Signed-off-by: Fabio Estevam <festevam@gmail.com> +--- + 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) {
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 <festevam@gmail.com> --- ...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