1*4882a593SmuzhiyunFrom 5c30b9d79ca60fe260d86264c4ca4a579fd5def1 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 63/95] 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          | 8 ++++++++
14*4882a593Smuzhiyun libweston/backend-drm/kms.c          | 7 ++++---
15*4882a593Smuzhiyun 3 files changed, 13 insertions(+), 3 deletions(-)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h
18*4882a593Smuzhiyunindex b7deeb0..46edbc6 100644
19*4882a593Smuzhiyun--- a/libweston/backend-drm/drm-internal.h
20*4882a593Smuzhiyun+++ b/libweston/backend-drm/drm-internal.h
21*4882a593Smuzhiyun@@ -356,6 +356,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 cb40715..05ae2c1 100644
31*4882a593Smuzhiyun--- a/libweston/backend-drm/drm.c
32*4882a593Smuzhiyun+++ b/libweston/backend-drm/drm.c
33*4882a593Smuzhiyun@@ -2333,6 +2333,10 @@ drm_output_detach_crtc(struct drm_output *output)
34*4882a593Smuzhiyun
35*4882a593Smuzhiyun 	crtc->output = NULL;
36*4882a593Smuzhiyun 	output->crtc = NULL;
37*4882a593Smuzhiyun+
38*4882a593Smuzhiyun+	/* HACK: Do it here rather than in the kms.c for drm-master config */
39*4882a593Smuzhiyun+	drmModeSetCrtc(crtc->device->drm.fd,
40*4882a593Smuzhiyun+		       crtc->crtc_id, 0, 0, 0, NULL, 0, NULL);
41*4882a593Smuzhiyun }
42*4882a593Smuzhiyun
43*4882a593Smuzhiyun static int
44*4882a593Smuzhiyun@@ -4257,6 +4261,10 @@ drm_backend_create(struct weston_compositor *compositor,
45*4882a593Smuzhiyun 	if (b == NULL)
46*4882a593Smuzhiyun 		return NULL;
47*4882a593Smuzhiyun
48*4882a593Smuzhiyun+	buf = getenv("WESTON_DRM_MASTER");
49*4882a593Smuzhiyun+	if (buf && buf[0] == '1')
50*4882a593Smuzhiyun+		b->master = true;
51*4882a593Smuzhiyun+
52*4882a593Smuzhiyun 	buf = getenv("WESTON_DRM_SINGLE_HEAD");
53*4882a593Smuzhiyun 	if (buf && buf[0] == '1')
54*4882a593Smuzhiyun 		b->single_head = true;
55*4882a593Smuzhiyundiff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
56*4882a593Smuzhiyunindex 607bf70..38ecf68 100644
57*4882a593Smuzhiyun--- a/libweston/backend-drm/kms.c
58*4882a593Smuzhiyun+++ b/libweston/backend-drm/kms.c
59*4882a593Smuzhiyun@@ -1217,7 +1217,7 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state,
60*4882a593Smuzhiyun 		break;
61*4882a593Smuzhiyun 	}
62*4882a593Smuzhiyun
63*4882a593Smuzhiyun-	if (device->state_invalid) {
64*4882a593Smuzhiyun+	if (device->state_invalid && b->master) {
65*4882a593Smuzhiyun 		struct weston_head *head_base;
66*4882a593Smuzhiyun 		struct drm_head *head;
67*4882a593Smuzhiyun 		struct drm_crtc *crtc;
68*4882a593Smuzhiyun@@ -1417,7 +1417,7 @@ drm_pending_state_apply(struct drm_pending_state *pending_state)
69*4882a593Smuzhiyun 		return drm_pending_state_apply_atomic(pending_state,
70*4882a593Smuzhiyun 						      DRM_STATE_APPLY_ASYNC);
71*4882a593Smuzhiyun
72*4882a593Smuzhiyun-	if (device->state_invalid) {
73*4882a593Smuzhiyun+	if (device->state_invalid && b->master) {
74*4882a593Smuzhiyun 		/* If we need to reset all our state (e.g. because we've
75*4882a593Smuzhiyun 		 * just started, or just been VT-switched in), explicitly
76*4882a593Smuzhiyun 		 * disable all the CRTCs we aren't using. This also disables
77*4882a593Smuzhiyun@@ -1476,6 +1476,7 @@ int
78*4882a593Smuzhiyun drm_pending_state_apply_sync(struct drm_pending_state *pending_state)
79*4882a593Smuzhiyun {
80*4882a593Smuzhiyun 	struct drm_device *device = pending_state->device;
81*4882a593Smuzhiyun+	struct drm_backend *b = device->backend;
82*4882a593Smuzhiyun 	struct drm_output_state *output_state, *tmp;
83*4882a593Smuzhiyun 	struct drm_crtc *crtc;
84*4882a593Smuzhiyun 	int has_error = 0;
85*4882a593Smuzhiyun@@ -1484,7 +1485,7 @@ drm_pending_state_apply_sync(struct drm_pending_state *pending_state)
86*4882a593Smuzhiyun 		return drm_pending_state_apply_atomic(pending_state,
87*4882a593Smuzhiyun 						      DRM_STATE_APPLY_SYNC);
88*4882a593Smuzhiyun
89*4882a593Smuzhiyun-	if (device->state_invalid) {
90*4882a593Smuzhiyun+	if (device->state_invalid && b->master) {
91*4882a593Smuzhiyun 		/* If we need to reset all our state (e.g. because we've
92*4882a593Smuzhiyun 		 * just started, or just been VT-switched in), explicitly
93*4882a593Smuzhiyun 		 * disable all the CRTCs we aren't using. This also disables
94*4882a593Smuzhiyun--
95*4882a593Smuzhiyun2.20.1
96*4882a593Smuzhiyun
97