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

xf86/logind: fix missing call to vtenter if the platform device is not paused 

If there is one platform device, which is not paused nor resumed,
systemd_logind_vtenter() will never get called.
This break suspend/resume, and switching to VT on system with Nvidia
proprietary driver.
This is a regression introduced by f5bd039633

So now call systemd_logind_vtenter() if there are no paused
platform devices.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1271
Fixes: f5bd0396 - xf86/logind: fix call systemd_logind_vtenter after receiving drm device resume

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Jocelyn Falempe 2021-12-17 10:18:25 +01:00
parent 9c66d910ca
commit 38291fa86c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,6 +316,7 @@ void systemd_logind_drop_master(void)
dbus_int32_t major, minor; dbus_int32_t major, minor;
struct systemd_logind_info *info = &logind_info; struct systemd_logind_info *info = &logind_info;
xf86_platform_devices[i].flags |= XF86_PDEV_PAUSED;
major = xf86_platform_odev_attributes(i)->major; major = xf86_platform_odev_attributes(i)->major;
minor = xf86_platform_odev_attributes(i)->minor; minor = xf86_platform_odev_attributes(i)->minor;
systemd_logind_ack_pause(info, minor, major); systemd_logind_ack_pause(info, minor, major);
@ -323,6 +324,16 @@ void systemd_logind_drop_master(void)
} }
} }
static Bool are_platform_devices_resumed(void) {
int i;
for (i = 0; i < xf86_num_platform_devices; i++) {
if (xf86_platform_devices[i].flags & XF86_PDEV_PAUSED) {
return FALSE;
}
}
return TRUE;
}
static DBusHandlerResult static DBusHandlerResult
message_filter(DBusConnection * connection, DBusMessage * message, void *data) message_filter(DBusConnection * connection, DBusMessage * message, void *data)
{ {
@ -416,13 +427,11 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data)
if (pdev) { if (pdev) {
pdev->flags &= ~XF86_PDEV_PAUSED; pdev->flags &= ~XF86_PDEV_PAUSED;
systemd_logind_vtenter();
} else } else
systemd_logind_set_input_fd_for_all_devs(major, minor, fd, systemd_logind_set_input_fd_for_all_devs(major, minor, fd,
info->vt_active); info->vt_active);
/* Call vtenter if all platform devices are resumed, or if there are no platform device */
/* Always call vtenter(), only if there are only legacy video devs */ if (are_platform_devices_resumed())
if (!xf86_num_platform_devices)
systemd_logind_vtenter(); systemd_logind_vtenter();
} }
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_HANDLED;