Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 1 | From ece4c3d261aeec230869c0304ed1011ff6837c16 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 12 Sep 2020 14:04:04 -0700 |
| 4 | Subject: [PATCH] Fix atomic modesetting with musl |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame] | 5 | |
| 6 | atomic modesetting seems to fail with drm weston backend and this patch fixes |
| 7 | it, below errors are seen before weston exits |
| 8 | |
| 9 | atomic: couldn't commit new state: Invalid argument |
| 10 | |
| 11 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 14 | --- |
| 15 | libweston/backend-drm/kms.c | 4 ++-- |
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c |
| 19 | index 780d007..9994da1 100644 |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame] | 20 | --- a/libweston/backend-drm/kms.c |
| 21 | +++ b/libweston/backend-drm/kms.c |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 22 | @@ -1142,8 +1142,8 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state, |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame] | 23 | wl_list_for_each(plane, &b->plane_list, link) { |
| 24 | drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n", |
| 25 | (unsigned long) plane->plane_id); |
| 26 | - plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); |
| 27 | - plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); |
| 28 | + //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); |
| 29 | + //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); |
| 30 | } |
| 31 | |
| 32 | flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; |