The modesetting driver in certain instances could be enumerated later than card0. Remove the restriction on search to just card0, as checks are now in place to query on the modesetting capabilities on enumerated devices.
Signed-off-by: Gowtham Tammana <[email protected]> --- ...t-restrict-udev-enumeration-to-card0.patch | 39 ------------------- .../wayland/weston_5.0.0.bbappend | 3 +- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-udev-seat-restrict-udev-enumeration-to-card0.patch diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-udev-seat-restrict-udev-enumeration-to-card0.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-udev-seat-restrict-udev-enumeration-to-card0.patch deleted file mode 100644 index 5ec9cd77..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston/0001-udev-seat-restrict-udev-enumeration-to-card0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e57e9245dcb5d1349467c7fc36d153f3336f6a1a Mon Sep 17 00:00:00 2001 -From: Karthik Ramanan <[email protected]> -Date: Mon, 12 Mar 2018 10:46:29 +0530 -Subject: [PATCH 1/4] udev-seat: restrict udev enumeration to card0 - -In case of separate GPU and Display devices as found in embedded systems, we -could have modeset node and render node controlled by different drivers. -There is a distinct possibility that udev enumeration returns the DRM device -corresponding to render node as the primary DRM device. - -Obviously, modeset operations cannot be done on the GPU DRM device. - -Restrict the udev enumeration to card0 and ensure that DRM device corresponding -to display is returned as the primary DRM device. - -Upstream-Status: Pending - -Signed-off-by: Anand Balagopalakrishnan <[email protected]> -Signed-off-by: Karthik Ramanan <[email protected]> ---- - libweston/compositor-drm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c -index 1d38f05..649b4f5 100644 ---- a/libweston/compositor-drm.c -+++ b/libweston/compositor-drm.c -@@ -2957,7 +2957,7 @@ find_primary_gpu(struct drm_backend *b, const char *seat) - - e = udev_enumerate_new(b->udev); - udev_enumerate_add_match_subsystem(e, "drm"); -- udev_enumerate_add_match_sysname(e, "card[0-9]*"); -+ udev_enumerate_add_match_sysname(e, "card0"); - - udev_enumerate_scan_devices(e); - drm_device = NULL; --- -1.9.1 - diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend index 68a928ee..1bdcf7e4 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend @@ -2,14 +2,13 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/libgbm mtdev" -PR_append = ".arago33" +PR_append = ".arago34" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" RDEPENDS_${PN} += "weston-conf" SRC_URI += " \ - file://0001-udev-seat-restrict-udev-enumeration-to-card0.patch \ file://0002-weston-Allow-visual_id-to-be-0.patch \ file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \ file://0004-weston-Fix-touch-screen-crash-issue.patch \ -- 2.23.0 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
