mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 18:08:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DRM leasing on some compositors after !2278

Browse source 
At the suggestion of @Supreeeme, this makes a change to some code I added to
the connector withdrawn handler in !2278 that causes an error when leasing
is attempted on some wayland compositors, namely niri.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2283>
This commit is contained in:
Joel Valenciano 2024-07-16 00:01:22 -05:00 committed by Marge Bot
parent c6d341a935
commit f9d02319ec
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xrt/compositor/main/comp_window_direct_wayland.c
View file

@ -168,7 +168,7 @@ comp_window_direct_wayland_create_surface(struct comp_window_direct_wayland *w,
VkResult ret = VK_ERROR_INCOMPATIBLE_DISPLAY_KHR;
if (w->selected_device == NULL || w->selected_connector == NULL || w->lease == NULL) {
COMP_ERROR(w->base.base.c, "Connector disconnected before it could be acquired");
COMP_ERROR(w->base.base.c, "Connector was disconnected before it could be acquired");
return VK_ERROR_INITIALIZATION_FAILED;
}
@ -280,7 +280,7 @@ _lease_connector_withdrawn(void *data, struct wp_drm_lease_connector_v1 *wp_drm_
{
struct direct_wayland_lease_connector *conn = data;
COMP_DEBUG(conn->w->base.base.c, "Connector %s has been withdrawn by the compositor", conn->name);
if (conn == conn->w->selected_connector) {
if (conn == conn->w->selected_connector && !conn->w->lease->lease) {
conn->w->selected_connector = NULL;
}
}