xserver: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jul 17 08:25:42 UTC 2023
hw/xwayland/xwayland-drm-lease.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
New commits:
commit ef1812655b154cc7247cb8623cd0880408872585
Author: Russell Chou <russellc at nvidia.com>
Date: Mon Jul 17 08:25:39 2023 +0000
xwayland: Clean up drm lease when terminating. #946
diff --git a/hw/xwayland/xwayland-drm-lease.c b/hw/xwayland/xwayland-drm-lease.c
index d623b4b79..51e9072e4 100644
--- a/hw/xwayland/xwayland-drm-lease.c
+++ b/hw/xwayland/xwayland-drm-lease.c
@@ -35,6 +35,18 @@
#include "xwayland-screen.h"
#include "xwayland-output.h"
+static void
+xwl_randr_lease_cleanup_outputs(RRLeasePtr rrLease)
+{
+ struct xwl_output *output;
+ int i;
+
+ for (i = 0; i < rrLease->numOutputs; ++i) {
+ output = rrLease->outputs[i]->devPrivate;
+ output->lease = NULL;
+ }
+}
+
static void
drm_lease_handle_lease_fd(void *data,
struct wp_drm_lease_v1 *wp_drm_lease_v1,
@@ -51,17 +63,12 @@ drm_lease_handle_finished(void *data,
struct wp_drm_lease_v1 *wp_drm_lease_v1)
{
struct xwl_drm_lease *lease = (struct xwl_drm_lease *)data;
- struct xwl_output *output;
- int i;
if (lease->fd >= 0) {
RRTerminateLease(lease->rrLease);
} else {
AttendClient(lease->client);
- for (i = 0; i < lease->rrLease->numOutputs; ++i) {
- output = lease->rrLease->outputs[i]->devPrivate;
- output->lease = NULL;
- }
+ xwl_randr_lease_cleanup_outputs(lease->rrLease);
}
}
@@ -164,6 +171,7 @@ xwl_randr_terminate_lease(ScreenPtr screen, RRLeasePtr lease)
struct xwl_drm_lease *lease_private = lease->devPrivate;
if (lease_private) {
+ xwl_randr_lease_cleanup_outputs(lease);
xorg_list_del(&lease_private->link);
if (lease_private->fd >= 0)
close(lease_private->fd);
More information about the xorg-commit
mailing list