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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
From 9c66d910cae107cbcda02a8502ac5324a6eca052 Mon Sep 17 00:00:00 2001
From: Jocelyn Falempe <jfalempe@redhat.com>
Date: Thu, 16 Dec 2021 15:46:43 +0100
Subject: [PATCH 1/2] xf86/logind: Fix compilation error when built without
logind/platform bus
This was introduced by commit 8eb1396d
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1269
Fixes: da9d012a9 - xf86/logind: Fix drm_drop_master before vt_reldisp
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
---
hw/xfree86/common/xf86Events.c | 9 +--------
hw/xfree86/os-support/linux/systemd-logind.c | 16 +++++++++++-----
include/systemd-logind.h | 4 ++--
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 6076efa80..395bbc7b3 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -383,14 +383,7 @@ xf86VTLeave(void)
xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]);
if (systemd_logind_controls_session()) {
- for (i = 0; i < xf86_num_platform_devices; i++) {
- if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
- int major, minor;
- major = xf86_platform_odev_attributes(i)->major;
- minor = xf86_platform_odev_attributes(i)->minor;
- systemd_logind_drop_master(major, minor);
- }
- }
+ systemd_logind_drop_master();
}
if (!xf86VTSwitchAway())
diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
index 35d5cc75b..f6a223a55 100644
--- a/hw/xfree86/os-support/linux/systemd-logind.c
+++ b/hw/xfree86/os-support/linux/systemd-logind.c
@@ -308,13 +308,19 @@ cleanup:
* and ensure the drm_drop_master is done before
* VT_RELDISP when switching VT
*/
-void systemd_logind_drop_master(int _major, int _minor)
+void systemd_logind_drop_master(void)
{
- struct systemd_logind_info *info = &logind_info;
- dbus_int32_t major = _major;
- dbus_int32_t minor = _minor;
+ int i;
+ for (i = 0; i < xf86_num_platform_devices; i++) {
+ if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
+ dbus_int32_t major, minor;
+ struct systemd_logind_info *info = &logind_info;
- systemd_logind_ack_pause(info, minor, major);
+ major = xf86_platform_odev_attributes(i)->major;
+ minor = xf86_platform_odev_attributes(i)->minor;
+ systemd_logind_ack_pause(info, minor, major);
+ }
+ }
}
static DBusHandlerResult
diff --git a/include/systemd-logind.h b/include/systemd-logind.h
index a8af2b96d..5c04d0130 100644
--- a/include/systemd-logind.h
+++ b/include/systemd-logind.h
@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus);
void systemd_logind_release_fd(int major, int minor, int fd);
int systemd_logind_controls_session(void);
void systemd_logind_vtenter(void);
-void systemd_logind_drop_master(int major, int minor);
+void systemd_logind_drop_master(void);
#else
#define systemd_logind_init()
#define systemd_logind_fini()
@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor);
#define systemd_logind_release_fd(major, minor, fd) close(fd)
#define systemd_logind_controls_session() 0
#define systemd_logind_vtenter()
-#define systemd_logind_drop_master(major, minor)
+#define systemd_logind_drop_master()
#endif
#endif
--
2.34.1
|