1*4882a593SmuzhiyunFrom fc3415733e84b0f9f635b793a0ab18d6fcb8a727 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Wed, 27 Apr 2022 15:17:39 +0800 4*4882a593SmuzhiyunSubject: [PATCH 61/79] backend-drm: Stop disabling unused CRTCs by default 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSo that we can launch multiple weston instances for different monitors. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSet env "WESTON_DRM_MASTER" to take charge of all CRTCs again. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun libweston/backend-drm/drm-internal.h | 1 + 13*4882a593Smuzhiyun libweston/backend-drm/drm.c | 7 +++++++ 14*4882a593Smuzhiyun libweston/backend-drm/kms.c | 6 +++--- 15*4882a593Smuzhiyun 3 files changed, 11 insertions(+), 3 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h 18*4882a593Smuzhiyunindex 9543f1b..8035826 100644 19*4882a593Smuzhiyun--- a/libweston/backend-drm/drm-internal.h 20*4882a593Smuzhiyun+++ b/libweston/backend-drm/drm-internal.h 21*4882a593Smuzhiyun@@ -340,6 +340,7 @@ struct drm_backend { 22*4882a593Smuzhiyun int64_t last_resize_ms; 23*4882a593Smuzhiyun int64_t resize_freeze_ms; 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun+ bool master; 26*4882a593Smuzhiyun bool single_head; 27*4882a593Smuzhiyun bool head_fallback; 28*4882a593Smuzhiyun bool head_fallback_all; 29*4882a593Smuzhiyundiff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c 30*4882a593Smuzhiyunindex ff41669..ed28956 100644 31*4882a593Smuzhiyun--- a/libweston/backend-drm/drm.c 32*4882a593Smuzhiyun+++ b/libweston/backend-drm/drm.c 33*4882a593Smuzhiyun@@ -2251,6 +2251,9 @@ drm_output_detach_crtc(struct drm_output *output) 34*4882a593Smuzhiyun /* Force resetting unused CRTCs */ 35*4882a593Smuzhiyun b->state_invalid = true; 36*4882a593Smuzhiyun output->state_invalid = true; 37*4882a593Smuzhiyun+ 38*4882a593Smuzhiyun+ /* HACK: Do it here rather than in the kms.c for drm-master config */ 39*4882a593Smuzhiyun+ drmModeSetCrtc(b->drm.fd, crtc->crtc_id, 0, 0, 0, NULL, 0, NULL); 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun static int 43*4882a593Smuzhiyun@@ -4120,6 +4123,10 @@ drm_backend_create(struct weston_compositor *compositor, 44*4882a593Smuzhiyun if (b == NULL) 45*4882a593Smuzhiyun return NULL; 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun+ buf = getenv("WESTON_DRM_MASTER"); 48*4882a593Smuzhiyun+ if (buf && buf[0] == '1') 49*4882a593Smuzhiyun+ b->master = true; 50*4882a593Smuzhiyun+ 51*4882a593Smuzhiyun buf = getenv("WESTON_DRM_SINGLE_HEAD"); 52*4882a593Smuzhiyun if (buf && buf[0] == '1') 53*4882a593Smuzhiyun b->single_head = true; 54*4882a593Smuzhiyundiff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c 55*4882a593Smuzhiyunindex 82247fb..37da3f6 100644 56*4882a593Smuzhiyun--- a/libweston/backend-drm/kms.c 57*4882a593Smuzhiyun+++ b/libweston/backend-drm/kms.c 58*4882a593Smuzhiyun@@ -1190,7 +1190,7 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state, 59*4882a593Smuzhiyun break; 60*4882a593Smuzhiyun } 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun- if (b->state_invalid) { 63*4882a593Smuzhiyun+ if (b->state_invalid && b->master) { 64*4882a593Smuzhiyun struct weston_head *head_base; 65*4882a593Smuzhiyun struct drm_head *head; 66*4882a593Smuzhiyun struct drm_crtc *crtc; 67*4882a593Smuzhiyun@@ -1388,7 +1388,7 @@ drm_pending_state_apply(struct drm_pending_state *pending_state) 68*4882a593Smuzhiyun return drm_pending_state_apply_atomic(pending_state, 69*4882a593Smuzhiyun DRM_STATE_APPLY_ASYNC); 70*4882a593Smuzhiyun 71*4882a593Smuzhiyun- if (b->state_invalid) { 72*4882a593Smuzhiyun+ if (b->state_invalid && b->master) { 73*4882a593Smuzhiyun /* If we need to reset all our state (e.g. because we've 74*4882a593Smuzhiyun * just started, or just been VT-switched in), explicitly 75*4882a593Smuzhiyun * disable all the CRTCs we aren't using. This also disables 76*4882a593Smuzhiyun@@ -1455,7 +1455,7 @@ drm_pending_state_apply_sync(struct drm_pending_state *pending_state) 77*4882a593Smuzhiyun return drm_pending_state_apply_atomic(pending_state, 78*4882a593Smuzhiyun DRM_STATE_APPLY_SYNC); 79*4882a593Smuzhiyun 80*4882a593Smuzhiyun- if (b->state_invalid) { 81*4882a593Smuzhiyun+ if (b->state_invalid && b->master) { 82*4882a593Smuzhiyun /* If we need to reset all our state (e.g. because we've 83*4882a593Smuzhiyun * just started, or just been VT-switched in), explicitly 84*4882a593Smuzhiyun * disable all the CRTCs we aren't using. This also disables 85*4882a593Smuzhiyun-- 86*4882a593Smuzhiyun2.20.1 87*4882a593Smuzhiyun 88