frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jocelyn Falempe 2021-12-16 15:46:43 +01:00
parent 5b8817a019
commit 9c66d910ca
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/common/xf86Events.c
View File

@ -383,14 +383,7 @@ xf86VTLeave(void)
xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]); xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]);
if (systemd_logind_controls_session()) { if (systemd_logind_controls_session()) {
for (i = 0; i < xf86_num_platform_devices; i++) { systemd_logind_drop_master();
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);
}
}
} }
if (!xf86VTSwitchAway()) if (!xf86VTSwitchAway())

16
hw/xfree86/os-support/linux/systemd-logind.c
View File

@ -308,13 +308,19 @@ cleanup:
* and ensure the drm_drop_master is done before * and ensure the drm_drop_master is done before
* VT_RELDISP when switching VT * 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; int i;
dbus_int32_t major = _major; for (i = 0; i < xf86_num_platform_devices; i++) {
dbus_int32_t minor = _minor; 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 static DBusHandlerResult

4
include/systemd-logind.h
View File

@ -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); void systemd_logind_release_fd(int major, int minor, int fd);
int systemd_logind_controls_session(void); int systemd_logind_controls_session(void);
void systemd_logind_vtenter(void); void systemd_logind_vtenter(void);
void systemd_logind_drop_master(int major, int minor); void systemd_logind_drop_master(void);
#else #else
#define systemd_logind_init() #define systemd_logind_init()
#define systemd_logind_fini() #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_release_fd(major, minor, fd) close(fd)
#define systemd_logind_controls_session() 0 #define systemd_logind_controls_session() 0
#define systemd_logind_vtenter() #define systemd_logind_vtenter()
#define systemd_logind_drop_master(major, minor) #define systemd_logind_drop_master()
#endif #endif
#endif #endif