mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm-lease-v1: remove connector active_lease & lease connectors

Browse source 
Upon leasing, the wlr_drm_lease_connector_v1 will be automatically clean up by the wlr_output
destroy handler. There is no need for the wlr_drm_lease_manager to keep track of leased connectors.
This commit is contained in:
Simon Zeni 2025-07-04 15:34:14 -04:00 • committed by Simon Ser
parent 423afc3fc9
commit 0166fd9eb7
2 changed files with 0 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/wlr/types/wlr_drm_lease_v1.h
View file

@ -62,8 +62,6 @@ struct wlr_drm_lease_connector_v1 {
struct wlr_output *output;
struct wlr_drm_lease_device_v1 *device;
/** NULL if no client is currently leasing this connector */
struct wlr_drm_lease_v1 *active_lease;
struct wl_list link; // wlr_drm_lease_device_v1.connectors
@ -93,9 +91,6 @@ struct wlr_drm_lease_v1 {
struct wlr_drm_lease_device_v1 *device;
struct wlr_drm_lease_connector_v1 **connectors;
size_t n_connectors;
struct wl_list link; // wlr_drm_lease_device_v1.leases
void *data;

37
types/wlr_drm_lease_v1.c
View file

@ -68,10 +68,6 @@ static void drm_lease_connector_v1_destroy(
wlr_log(WLR_DEBUG, "Destroying connector %s", connector->output->name);
if (connector->active_lease) {
wlr_drm_lease_terminate(connector->active_lease->drm_lease);
}
struct wl_resource *resource, *tmp;
wl_resource_for_each_safe(resource, tmp, &connector->resources) {
wp_drm_lease_connector_v1_send_withdrawn(resource);
@ -140,14 +136,9 @@ static void lease_handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&lease->destroy.link);
for (size_t i = 0; i < lease->n_connectors; ++i) {
lease->connectors[i]->active_lease = NULL;
}
wl_list_remove(&lease->link);
wl_resource_set_user_data(lease->resource, NULL);
free(lease->connectors);
free(lease);
}
@ -180,20 +171,6 @@ struct wlr_drm_lease_v1 *wlr_drm_lease_request_v1_grant(
return NULL;
}
lease->connectors = calloc(request->n_connectors, sizeof(*lease->connectors));
if (!lease->connectors) {
wlr_log(WLR_ERROR, "Failed to allocate lease connectors list");
close(fd);
wp_drm_lease_v1_send_finished(lease->resource);
free(lease);
return NULL;
}
lease->n_connectors = request->n_connectors;
for (size_t i = 0; i < request->n_connectors; ++i) {
lease->connectors[i] = request->connectors[i];
lease->connectors[i]->active_lease = lease;
}
lease->destroy.notify = lease_handle_destroy;
wl_signal_add(&lease->drm_lease->events.destroy, &lease->destroy);
@ -338,16 +315,6 @@ static void drm_lease_request_v1_handle_submit(
return;
}
for (size_t i = 0; i < request->n_connectors; ++i) {
struct wlr_drm_lease_connector_v1 *conn = request->connectors[i];
if (conn->active_lease) {
wlr_log(WLR_ERROR, "Failed to create lease, connector %s has "
"already been leased", conn->output->name);
wp_drm_lease_v1_send_finished(lease_resource);
return;
}
}
request->lease_resource = lease_resource;
wl_signal_emit_mutable(&request->device->manager->events.request,
@ -440,10 +407,6 @@ static struct wp_drm_lease_connector_v1_interface lease_connector_impl = {
static void drm_lease_connector_v1_send_to_client(
struct wlr_drm_lease_connector_v1 *connector,
struct wl_resource *resource) {
if (connector->active_lease) {
return;
}
struct wl_client *client = wl_resource_get_client(resource);
uint32_t version = wl_resource_get_version(resource);