sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

wayland/drm-lease: Do not add connector twice on lease disappeared

Browse source 
lease_disappeared() was calling meta_drm_lease_disappeared() and
set_connectors_as_available().

meta_drm_lease_disappeared() emits the "revoked" signal, connected to
on_lease_revoked(), which marks the leased connectors as available by
calling set_connectors_as_available().

Therefore, calling set_connectors_as_available() again from
lease_disappeared() is redundant.

Remove the redundant call to set_connectors_as_available() and drop two
unused functions.

Fixes: fc44437876 ("wayland/drm-lease: Withdrawn leased connectors")
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3675
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4029>
This commit is contained in:
José Expósito 2024-09-16 16:16:45 +02:00 committed by Marge Bot
parent 4795e23f2c
commit 3199d4bbb8
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/backends/native/meta-drm-lease.c
View file

@ -386,12 +386,6 @@ meta_drm_lease_revoke (MetaDrmLease *lease)
mark_revoked (lease); mark_revoked (lease);
} }
static void
meta_drm_lease_disappeared (MetaDrmLease *lease)
{
mark_revoked (lease);
}
static void static void
meta_drm_lease_dispose (GObject *object) meta_drm_lease_dispose (GObject *object)
{ {
@ -768,14 +762,6 @@ update_resources (MetaDrmLeaseManager *lease_manager)
} }
} }
static void
lease_disappeared (MetaDrmLeaseManager *lease_manager,
MetaDrmLease *lease)
{
meta_drm_lease_disappeared (lease);
set_connectors_as_available (lease_manager, lease);
}
static gboolean static gboolean
did_lease_disappear (MetaDrmLease *lease, did_lease_disappear (MetaDrmLease *lease,
uint32_t *lessees, uint32_t *lessees,
@ -832,7 +818,7 @@ update_leases (MetaDrmLeaseManager *lease_manager)
{ {
lease = l->data; lease = l->data;
lease_disappeared (lease_manager, lease); mark_revoked (lease);
} }
} }