Skip to contentSkip to conversation

weston: Add new fix patch for dual display issue

PATCH New Andrew F. Davis 1 participant 1 message Mar 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 weston: Add new fix patch for dual display issue

---
 ...ct-plane-based-on-current-attached-C.patch | 69 ++++++++++++++++
 ...05-weston-drm-fix-dual-display-issue.patch | 79 -------------------
 .../wayland/weston_7.0.0.bbappend             |  2 +-
 3 files changed, 70 insertions(+), 80 deletions(-)
 create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-backend-drm-Select-plane-based-on-current-attached-C.patch
 delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0005-weston-drm-fix-dual-display-issue.patch
meta-arago-distro/recipes-graphics/wayland/weston/0001-backend-drm-Select-plane-based-on-current-attached-C.patch new file +69 -0
new file mode 100644
index 00000000..ef445797
@@ -0,0 +1,69 @@
+From 943323d177ef33494d9d063aeb7f0e9785d9b3c1 Mon Sep 17 00:00:00 2001
+From: "Andrew F. Davis" <[email protected]>
+Date: Fri, 6 Mar 2020 13:06:55 -0500
+Subject: [PATCH] backend-drm: Select plane based on current attached CRTC
+
+When doing plane selection for an output CRTC check if the plane
+already has a CRTC attached and if so prefer that plane only for
+the corresponding CRTC.
+
+This prevents changing a CRTC's primary plane when it is active
+which is not allowed by the DRM framework.
+
+Based-on-patch-by: Eric Ruei <[email protected]>
+Signed-off-by: Andrew F. Davis <[email protected]>
+---
+ libweston/backend-drm/drm-internal.h |  1 +
+ libweston/backend-drm/drm.c          | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h
+index 6f5a9880..65b7486d 100644
+--- a/libweston/backend-drm/drm-internal.h
++++ b/libweston/backend-drm/drm-internal.h
+@@ -398,6 +398,7 @@ struct drm_plane {
+ 
+ 	uint32_t possible_crtcs;
+ 	uint32_t plane_id;
++	uint32_t crtc_id;
+ 	uint32_t count_formats;
+ 
+ 	struct drm_property_info props[WDRM_PLANE__COUNT];
+diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
+index 041a15a5..544b1aff 100644
+--- a/libweston/backend-drm/drm.c
++++ b/libweston/backend-drm/drm.c
+@@ -819,6 +819,7 @@ drm_plane_create(struct drm_backend *b, const drmModePlane *kplane,
+ 	if (kplane) {
+ 		plane->possible_crtcs = kplane->possible_crtcs;
+ 		plane->plane_id = kplane->plane_id;
++		plane->crtc_id = kplane->crtc_id;
+ 
+ 		props = drmModeObjectGetProperties(b->drm.fd, kplane->plane_id,
+ 						   DRM_MODE_OBJECT_PLANE);
+@@ -843,6 +844,7 @@ drm_plane_create(struct drm_backend *b, const drmModePlane *kplane,
+ 	else {
+ 		plane->possible_crtcs = (1 << output->pipe);
+ 		plane->plane_id = 0;
++		plane->crtc_id = 0;
+ 		plane->count_formats = 1;
+ 		plane->formats[0].format = format;
+ 		plane->type = type;
+@@ -950,6 +952,14 @@ drm_output_find_special_plane(struct drm_backend *b, struct drm_output *output,
+ 		if (found_elsewhere)
+ 			continue;
+ 
++		/* If a plane already has a CRTC selected and it is not our
++		 * output's CRTC, then do not select this plane. We cannot
++		 * switch away a plane from a CTRC when active. */
++		if ((type == WDRM_PLANE_TYPE_PRIMARY) &&
++		    (plane->crtc_id != 0) &&
++		    (plane->crtc_id != output->crtc_id))
++			continue;
++
+ 		plane->possible_crtcs = (1 << output->pipe);
+ 		return plane;
+ 	}
+-- 
+2.17.1
+
meta-arago-distro/recipes-graphics/wayland/weston/0005-weston-drm-fix-dual-display-issue.patch deleted +0 -79

79 lines not on this page · raw message

meta-arago-distro/recipes-graphics/wayland/weston_7.0.0.bbappend +1 -1
index 92e5570a..7a937f08 100644
@@ -7,10 +7,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 RDEPENDS_${PN} += "weston-conf"
 
 #        file://0002-weston-Allow-visual_id-to-be-0.patch
-#        file://0005-weston-drm-fix-dual-display-issue.patch
 SRC_URI += " \
         file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
         file://0004-weston-Fix-touch-screen-crash-issue.patch \
+        file://0001-backend-drm-Select-plane-based-on-current-attached-C.patch \
 "
 
 INHIBIT_PACKAGE_STRIP = "1"
Signature · 1 line
2.17.1