1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From 6d9e9dfa0479abc0ed7921a4ebf42228c0da7533 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Wed, 22 Jun 2022 08:58:21 +0200
Subject: [PATCH] backend-drm: make sure all buffers are released when an
output is removed
When an output is destroyed then the output state is freed immediately. In this
case, the plane state is only partially destroyed because it is the currently
active state. This includes the buffer reference.
Without the output, the plane will not be updated any more until it is used by a
different output (if possible) or the output returns and the plane is used
again.
As a result, the buffer reference is kept for a long time. This will cause some
applications to stall because weston now keeps two buffers (the one here and
another one for a different output where the application is now displayed).
To avoid this, do a synchronous commit that disables the output. The output
needs to be disabled anyways and this way the current state contains no
buffers that would remain.
`device->state_invalid = true` in drm_output_detach_crtc() is no longer
needed, because drm_output_detach_crtc() is called only when initialization
failed and the crtc was not yet used or in drm_output_deinit() when the
crtc was already disabled with the new synchronous commit.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
(cherry picked from commit f5a4fb5abcb8aeb6b078b6235834cc4ab6176c26)
Upstream-Status: Pending
---
libweston/backend-drm/drm.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
index 42787702..8425b0e9 100644
--- a/libweston/backend-drm/drm.c
+++ b/libweston/backend-drm/drm.c
@@ -1769,14 +1769,11 @@ drm_output_attach_crtc(struct drm_output *output)
static void
drm_output_detach_crtc(struct drm_output *output)
{
- struct drm_backend *b = output->backend;
struct drm_crtc *crtc = output->crtc;
crtc->output = NULL;
output->crtc = NULL;
- /* Force resetting unused CRTCs */
- b->state_invalid = true;
}
static int
@@ -1839,6 +1836,13 @@ drm_output_deinit(struct weston_output *base)
{
struct drm_output *output = to_drm_output(base);
struct drm_backend *b = to_drm_backend(base->compositor);
+ struct drm_pending_state *pending;
+
+ if (!b->shutting_down) {
+ pending = drm_pending_state_alloc(b);
+ drm_output_get_disable_state(pending, output);
+ drm_pending_state_apply_sync(pending);
+ }
if (b->use_pixman)
drm_output_fini_pixman(output);
--
2.39.2
|
