yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland/drmlease: correct DrmLeaseDeviceV1Interface::setDrmMaster

Browse source
This commit is contained in:
Xaver Hugl 2022-07-11 17:07:27 +02:00
parent 9ac3c64d4c
commit c050716a3b
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/wayland/drmleasedevice_v1_interface.cpp
View file

@ -30,16 +30,10 @@ DrmLeaseDeviceV1Interface::~DrmLeaseDeviceV1Interface()
void DrmLeaseDeviceV1Interface::setDrmMaster(bool hasDrmMaster) void DrmLeaseDeviceV1Interface::setDrmMaster(bool hasDrmMaster)
{ {
if (hasDrmMaster && !d->hasDrmMaster) { if (hasDrmMaster == d->hasDrmMaster) {
// withdraw all connectors return;
for (const auto &connector : qAsConst(d->connectors)) { }
DrmLeaseConnectorV1InterfacePrivate::get(connector)->withdraw(); if (hasDrmMaster) {
}
// and revoke all leases
for (const auto &lease : qAsConst(d->leases)) {
lease->deny();
}
} else if (!hasDrmMaster && d->hasDrmMaster) {
// send pending drm fds // send pending drm fds
while (!d->pendingFds.isEmpty()) { while (!d->pendingFds.isEmpty()) {
int fd = d->createNonMasterFd(); int fd = d->createNonMasterFd();
@ -56,8 +50,18 @@ void DrmLeaseDeviceV1Interface::setDrmMaster(bool hasDrmMaster)
connectorPrivate->send(connectorResource->handle); connectorPrivate->send(connectorResource->handle);
} }
} }
} else {
// withdraw all connectors
for (const auto &connector : qAsConst(d->connectors)) {
DrmLeaseConnectorV1InterfacePrivate::get(connector)->withdraw();
}
// and revoke all leases
for (const auto &lease : qAsConst(d->leases)) {
lease->deny();
}
} }
d->hasDrmMaster = hasDrmMaster; d->hasDrmMaster = hasDrmMaster;
done();
} }
void DrmLeaseDeviceV1Interface::done() void DrmLeaseDeviceV1Interface::done()