The GPU driver should not be creating a card node, if it does then that should be fixed in the driver, not hacked around in all these packages, remove this workaround.
Signed-off-by: Andrew Davis <[email protected]> --- ...-restrict-udev-enumeration-to-card0-.patch | 38 ------------------- .../glmark2/glmark2_git.bbappend | 6 --- 2 files changed, 44 deletions(-) delete mode 100644 meta-arago-distro/recipes-benchmark/glmark2/glmark2/0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch delete mode 100644 meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend diff --git a/meta-arago-distro/recipes-benchmark/glmark2/glmark2/0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch b/meta-arago-distro/recipes-benchmark/glmark2/glmark2/0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch deleted file mode 100644 index 48c780cd..00000000 --- a/meta-arago-distro/recipes-benchmark/glmark2/glmark2/0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - diff --git a/meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend b/meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend deleted file mode 100644 index bf4b3ac9..00000000 --- a/meta-arago-distro/recipes-benchmark/glmark2/glmark2_git.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -PR:append = ".arago0" - -SRC_URI += "file://0001-native-state-drm-restrict-udev-enumeration-to-card0-.patch" - -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14294): https://lists.yoctoproject.org/g/meta-arago/message/14294 Mute This Topic: https://lists.yoctoproject.org/mt/98062010/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
