1 From db6f5ce008d9b8a4cc7db71659ce1d21d3d7f97f Mon Sep 17 00:00:00 2001
2 From: Eric Ruei <e-ruei1@ti.com>
3 Date: Tue, 26 Mar 2019 13:32:31 -0400
4 Subject: [PATCH 3/3] weston: drm: fix dual display issue
6 This patch fixes the dual display issue by enhancing the primary plane
7 search algorithm to keep the plane which is connected to the crtc of
8 the output because the direct switching of active planes is not allowed.
10 Upstream status: Pending
12 Signed-off-by: Eric Ruei <e-ruei1@ti.com>
14 libweston/compositor-drm.c | 17 ++++++++++++++++-
15 1 file changed, 16 insertions(+), 1 deletion(-)
17 diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
18 index 3891176..fa694c3 100644
19 --- a/libweston/compositor-drm.c
20 +++ b/libweston/compositor-drm.c
21 @@ -428,6 +428,7 @@ struct drm_plane {
23 uint32_t possible_crtcs;
26 uint32_t count_formats;
28 struct drm_property_info props[WDRM_PLANE__COUNT];
29 @@ -4073,6 +4074,7 @@ drm_plane_create(struct drm_backend *b, const drmModePlane *kplane,
31 plane->possible_crtcs = kplane->possible_crtcs;
32 plane->plane_id = kplane->plane_id;
33 + plane->crtc_id = kplane->crtc_id;
35 props = drmModeObjectGetProperties(b->drm.fd, kplane->plane_id,
36 DRM_MODE_OBJECT_PLANE);
37 @@ -4097,6 +4099,7 @@ drm_plane_create(struct drm_backend *b, const drmModePlane *kplane,
39 plane->possible_crtcs = (1 << output->pipe);
42 plane->count_formats = 1;
43 plane->formats[0].format = format;
45 @@ -4157,6 +4160,7 @@ drm_output_find_special_plane(struct drm_backend *b, struct drm_output *output,
46 enum wdrm_plane_type type)
48 struct drm_plane *plane;
49 + struct drm_plane *plane2 = NULL; /* secondary plane */
51 if (!b->universal_planes) {
53 @@ -4204,11 +4208,22 @@ drm_output_find_special_plane(struct drm_backend *b, struct drm_output *output,
57 + /* The output should keep the primary plane connected to its
58 + * crtc since the direct switching of active plane is not
60 + if ((type == WDRM_PLANE_TYPE_PRIMARY) &&
61 + (plane->crtc_id != output->crtc_id)) {
62 + if (plane->crtc_id == 0) {
63 + plane->possible_crtcs = (1 << output->pipe);
68 plane->possible_crtcs = (1 << output->pipe);