Skip to contentSkip to conversation

Enable glmark2 2017.07

PATCH New Eric Ruei 1 participant 5 messages Nov 8, 2019

lore
Share & tools
lore

Eric Ruei

author
#0 lore raw

cover Enable glmark2 2017.07

Enable glmark2 2017.07 with Mesa-based EGL

Eric Ruei (4):
Revert "glmark2: specify dependency on libgbm"
Revert "glmark2: add tilcdc and tidss to the list of drm modules for
AM3 and AM6 respectively"
Revert "glmark2: overlay version 2014.03 locally"
glmark2: restrict udev enumeration to card0 only

 ...-restrict-udev-enumeration-to-card0-.patch | 38 ++++++++++++
 .../glmark2/glmark2_git.bbappend              |  6 ++
 ...hould-be-destoryed-after-the-wl_wind.patch | 34 -----------
 ...-add-tilcdc-and-tidss-to-drm_modules.patch | 28 ---------
 .../files/Fix-configure-for-sqrt-check.patch  | 13 ----
 ...ages-to-be-used-by-the-enabled-flavo.patch | 43 -------------
 .../recipes-benchmark/glmark2/glmark2_git.bb  | 61 -------------------
 7 files changed, 44 insertions(+), 179 deletions(-)
 create mode 100644 meta-arago-distro/recipes-benchmark/glmark2/glmark2/0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch
 create mode 100644 meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/0001-native-state-drm-add-tilcdc-and-tidss-to-drm_modules.patch
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/glmark2_git.bb
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/4 Revert "glmark2: specify dependency on libgbm"

This reverts commit a05eeecbf1f5a09a713b8059304b0842dfbd75d8. Start to use 2017.07 because all required EGL 1.5 extensions are supported by Mesa-based EGL now.

---
 meta-arago-extras/recipes-benchmark/glmark2/glmark2_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-extras/recipes-benchmark/glmark2/glmark2_git.bb +1 -1
index bc83358c..d7744add 100644
@@ -36,7 +36,7 @@ CXXFLAGS += "-std=c++11"
 PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11"
 PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11"
 PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm"
-PACKAGECONFIG[drm-gles2] = ",,virtual/libgles2 libdrm virtual/libgbm"
+PACKAGECONFIG[drm-gles2] = ",,virtual/libgles2 libdrm"
 PACKAGECONFIG[wayland-gl] = ",,virtual/libgl wayland"
 PACKAGECONFIG[wayland-gles2] = ",,virtual/libgles2 wayland"
 
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/4 Revert "glmark2: add tilcdc and tidss to the list of drm modules for AM3 and AM6 respectively"

In reply to Eric Ruei

This reverts commit 47c4b0aeb5599fe4937cd6dca43b43b7795b064a. Start to use 2017.07 because all required EGL 1.5 extensions are supported by Mesa-based EGL now.

---
 ...-add-tilcdc-and-tidss-to-drm_modules.patch | 28 -------------------
 .../recipes-benchmark/glmark2/glmark2_git.bb  |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/0001-native-state-drm-add-tilcdc-and-tidss-to-drm_modules.patch
meta-arago-extras/recipes-benchmark/glmark2/files/0001-native-state-drm-add-tilcdc-and-tidss-to-drm_modules.patch deleted +0 -28
deleted file mode 100644
index a66df92d..00000000
@@ -1,28 +0,0 @@
-From b533b3a738b49aa8ca0ad31a3a1ae7e62f0cc883 Mon Sep 17 00:00:00 2001
-From: Eric Ruei <[email protected]>
-Date: Thu, 18 Oct 2018 14:06:24 -0400
-Subject: [PATCH] native-state-drm: add tilcdc and tidss to drm_modules list
-
-Upstream-Status: Pending
-
-Signed-off-by: Eric Ruei <[email protected]>
----
- src/native-state-drm.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp
-index 5f4699f..ef369b0 100644
---- a/src/native-state-drm.cpp
-+++ b/src/native-state-drm.cpp
-@@ -207,6 +207,8 @@ NativeStateDRM::init()
-         "radeon",
-         "vmgfx",
-         "omapdrm",
-+        "tilcdc",
-+        "tidss",
-         "exynos",
-         "pl111",
-         "vc4",
--- 
-1.9.1
-
meta-arago-extras/recipes-benchmark/glmark2/glmark2_git.bb +0 -1
index d7744add..85d7bf16 100644
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \
     file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \
     file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \
     file://Fix-configure-for-sqrt-check.patch \
-    file://0001-native-state-drm-add-tilcdc-and-tidss-to-drm_modules.patch \
 "
 SRCREV = "9b1070fe9c5cf908f323909d3c8cbed08022abe8"
 
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 3/4 Revert "glmark2: overlay version 2014.03 locally"

In reply to Eric Ruei

This reverts commit 82e3228271b798d96d7ebb45d588eaff7b68b78a. Start to use 2017.07 because all required EGL 1.5 extensions are supported by Mesa-based EGL now.

---
 ...hould-be-destoryed-after-the-wl_wind.patch | 34 -----------
 .../files/Fix-configure-for-sqrt-check.patch  | 13 ----
 ...ages-to-be-used-by-the-enabled-flavo.patch | 43 -------------
 .../recipes-benchmark/glmark2/glmark2_git.bb  | 60 -------------------
 4 files changed, 150 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch
 delete mode 100644 meta-arago-extras/recipes-benchmark/glmark2/glmark2_git.bb
meta-arago-extras/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch deleted +0 -34
deleted file mode 100644
index 43950810..00000000
@@ -1,34 +0,0 @@
-From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001
-From: Yong Gan <[email protected]>
-Date: Tue, 27 Oct 2015 18:15:20 +0800
-Subject: [PATCH] Fix: wl_surface should be destoryed after the wl_window
- destroyed.
-
-Upstream-Status: Submitted [https://github.com/glmark2/glmark2/issues/12]
-
-Signed-off-by: Yong Gan <[email protected]>
-
----
- src/native-state-wayland.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/native-state-wayland.cpp b/src/native-state-wayland.cpp
-index 41fc743..cdcdf34 100644
---- a/src/native-state-wayland.cpp
-+++ b/src/native-state-wayland.cpp
-@@ -56,10 +56,10 @@ NativeStateWayland::~NativeStateWayland()
-             wl_shell_surface_destroy(window_->shell_surface);
-         if (window_->opaque_reqion)
-             wl_region_destroy(window_->opaque_reqion);
--        if (window_->surface)
--            wl_surface_destroy(window_->surface);
-         if (window_->native)
-             wl_egl_window_destroy(window_->native);
-+        if (window_->surface)
-+            wl_surface_destroy(window_->surface);
-         delete window_;
-     }
- 
--- 
-1.9.1
-
meta-arago-extras/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch deleted +0 -13
deleted file mode 100644
index fde82381..00000000
@@ -1,13 +0,0 @@
-Index: git/wscript
-===================================================================
---- git.orig/wscript	2016-07-29 13:15:44.954249796 -0500
-+++ git/wscript	2016-07-29 15:52:06.196768865 -0500
-@@ -90,7 +90,7 @@
-         ctx.check_cxx(lib = lib, uselib_store = uselib)
- 
-     # Check required functions
--    req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])]
-+    req_funcs = [('memset', 'string.h', [])]
-     for func, header, uselib in req_funcs:
-         ctx.check_cxx(function_name = func, header_name = header,
-                       uselib = uselib, mandatory = True)
meta-arago-extras/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch deleted +0 -43

43 lines not on this page · raw message

meta-arago-extras/recipes-benchmark/glmark2/glmark2_git.bb deleted +0 -60

60 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 4/4 glmark2: restrict udev enumeration to card0 only

In reply to Eric Ruei
---
 ...-restrict-udev-enumeration-to-card0-.patch | 38 +++++++++++++++++++
 .../glmark2/glmark2_git.bbappend              |  6 +++
 2 files changed, 44 insertions(+)
 create mode 100644 meta-arago-distro/recipes-benchmark/glmark2/glmark2/0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch
 create mode 100644 meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend
meta-arago-distro/recipes-benchmark/glmark2/glmark2/0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch new file +38 -0
new file mode 100644
index 00000000..48c780cd
@@ -0,0 +1,38 @@
+From bdb9181fc9b8ba0e32129e07be0a92a6bce4dc55 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <[email protected]>
+Date: Fri, 8 Nov 2019 11:49:28 -0500
+Subject: [PATCH] native-state-drm: restrict udev enumeration to card0 only
+
+In case of separate GPU and Display devices as found in embedded system,
+there could be modeset node and render node controlled by different
+drivers.  The current udev search algorithm does not verify whether
+the GPU DRM node is able to handle modesetting operation and thus select
+an invalid DRM node and then the DRM initialization will fail.
+
+This patch restricts the udev enumeration to card0 to ensure that the
+DRM device corresponding to dispaly is selected as the primarary DRM
+device.
+
+Upstream-Status: Inappropriate [Tentative workaround only]
+
+Signed-off-by: Eric Ruei <[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 dc2b323..cf17d88 100644
+--- a/src/native-state-drm.cpp
++++ b/src/native-state-drm.cpp
+@@ -280,7 +280,7 @@ static std::string udev_main_gpu_drm_node_path()
+     auto dev_enumeration = udev_enumerate_new(udev);
+ 
+     udev_enumerate_add_match_subsystem(dev_enumeration, "drm");
+-    udev_enumerate_add_match_sysname(dev_enumeration, "card[0-9]*");
++    udev_enumerate_add_match_sysname(dev_enumeration, "card0");
+     udev_enumerate_scan_devices(dev_enumeration);
+ 
+     Log::debug("Looking for the main GPU DRM node...\n");
+-- 
+2.17.1
+
meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend new file +6 -0
new file mode 100644
index 00000000..9cd8ce77
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PR_append = ".arago0"
+
+SRC_URI += "file://0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch"
+
Signature · 1 line
2.17.1