From db417a49e8d7391e11c6ecbccd6dbf22983f28bf Mon Sep 17 00:00:00 2001 From: Ikalco <73481042+ikalco@users.noreply.github.com> Date: Mon, 15 Jul 2024 13:03:00 -0500 Subject: [PATCH] drm: handle monitor hotplugs and fix a few bugs that it revealed (#14) * handle monitor hotplugs and fix a few bugs that it revealed * fix cursorFB uaf and other stuf --- include/aquamarine/backend/DRM.hpp | 2 +- src/backend/Session.cpp | 79 ++++++++++++++++-------------- src/backend/drm/DRM.cpp | 19 ++++--- 3 files changed, 55 insertions(+), 45 deletions(-) diff --git a/include/aquamarine/backend/DRM.hpp b/include/aquamarine/backend/DRM.hpp index 5eaf7ed..88ec1d3 100644 --- a/include/aquamarine/backend/DRM.hpp +++ b/include/aquamarine/backend/DRM.hpp @@ -287,7 +287,7 @@ namespace Aquamarine { SDRMPageFlip pendingPageFlip; bool frameEventScheduled = false; - drmModeModeInfo fallbackModeInfo; + Hyprutils::Memory::CSharedPointer fallbackMode; struct { bool vrrEnabled = false; diff --git a/src/backend/Session.cpp b/src/backend/Session.cpp index ac2a5a4..33a428b 100644 --- a/src/backend/Session.cpp +++ b/src/backend/Session.cpp @@ -303,48 +303,51 @@ void Aquamarine::CSession::dispatchUdevEvents() { return; } - if (action == std::string{"add"}) - events.addDrmCard.emit(SAddDrmCardEvent{.path = devnode}); - else if (action == std::string{"change"} || action == std::string{"remove"}) { - dev_t deviceNum = udev_device_get_devnum(device); - - for (auto& d : sessionDevices) { - if (d->dev != deviceNum) - continue; - - if (action == std::string{"change"}) { - backend->log(AQ_LOG_DEBUG, std::format("udev: DRM device {} changed", sysname ? sysname : "unknown")); - - CSessionDevice::SChangeEvent event; - - auto prop = udev_device_get_property_value(device, "HOTPLUG"); - if (prop && prop == std::string{"1"}) { - event.type = CSessionDevice::AQ_SESSION_EVENT_CHANGE_HOTPLUG; - - prop = udev_device_get_property_value(device, "CONNECTOR"); - if (prop) - event.hotplug.connectorID = std::stoull(prop); - - prop = udev_device_get_property_value(device, "PROPERTY"); - if (prop) - event.hotplug.propID = std::stoull(prop); - } else if (prop = udev_device_get_property_value(device, "LEASE"); prop && prop == std::string{"1"}) { - event.type = CSessionDevice::AQ_SESSION_EVENT_CHANGE_LEASE; - } else { - backend->log(AQ_LOG_DEBUG, std::format("udev: DRM device {} change event unrecognized", sysname ? sysname : "unknown")); - break; - } - - d->events.change.emit(event); - } else if (action == std::string{"remove"}) { - backend->log(AQ_LOG_DEBUG, std::format("udev: DRM device {} removed", sysname ? sysname : "unknown")); - d->events.remove.emit(); - } - + dev_t deviceNum = udev_device_get_devnum(device); + SP sessionDevice; + for (auto& sDev : sessionDevices) { + if (sDev->dev == deviceNum) { + sessionDevice = sDev; break; } } + if (!sessionDevice) { + udev_device_unref(device); + return; + } + + if (action == std::string{"add"}) + events.addDrmCard.emit(SAddDrmCardEvent{.path = devnode}); + else if (action == std::string{"change"}) { + backend->log(AQ_LOG_DEBUG, std::format("udev: DRM device {} changed", sysname ? sysname : "unknown")); + + CSessionDevice::SChangeEvent event; + + // + auto prop = udev_device_get_property_value(device, "HOTPLUG"); + if (prop && prop == std::string{"1"}) { + event.type = CSessionDevice::AQ_SESSION_EVENT_CHANGE_HOTPLUG; + + prop = udev_device_get_property_value(device, "CONNECTOR"); + if (prop) + event.hotplug.connectorID = std::stoull(prop); + + prop = udev_device_get_property_value(device, "PROPERTY"); + if (prop) + event.hotplug.propID = std::stoull(prop); + } else if (prop = udev_device_get_property_value(device, "LEASE"); prop && prop == std::string{"1"}) { + event.type = CSessionDevice::AQ_SESSION_EVENT_CHANGE_LEASE; + } else { + backend->log(AQ_LOG_DEBUG, std::format("udev: DRM device {} change event unrecognized", sysname ? sysname : "unknown")); + } + + sessionDevice->events.change.emit(event); + } else if (action == std::string{"remove"}) { + backend->log(AQ_LOG_DEBUG, std::format("udev: DRM device {} removed", sysname ? sysname : "unknown")); + sessionDevice->events.remove.emit(); + } + udev_device_unref(device); return; } diff --git a/src/backend/drm/DRM.cpp b/src/backend/drm/DRM.cpp index 44e4dab..f90967d 100644 --- a/src/backend/drm/DRM.cpp +++ b/src/backend/drm/DRM.cpp @@ -238,6 +238,9 @@ std::vector> Aquamarine::CDRMBackend::attempt(SP backe } backends.emplace_back(drmBackend); + + // so that session can handle udev change/remove events for this gpu + backend->session->sessionDevices.push_back(gpu); } return backends; @@ -1024,7 +1027,6 @@ drmModeModeInfo* Aquamarine::SDRMConnector::getCurrentMode() { if (crtc->props.mode_id) { size_t size = 0; return (drmModeModeInfo*)getDRMPropBlob(backend->gpu->fd, crtc->id, crtc->props.mode_id, &size); - ; } auto drmCrtc = drmModeGetCrtc(backend->gpu->fd, crtc->id); @@ -1095,15 +1097,15 @@ void Aquamarine::SDRMConnector::connect(drmModeConnector* connector) { continue; } - if (i == 1) - fallbackModeInfo = drmMode; - auto aqMode = makeShared(); aqMode->pixelSize = {drmMode.hdisplay, drmMode.vdisplay}; aqMode->refreshRate = calculateRefresh(drmMode); aqMode->preferred = (drmMode.type & DRM_MODE_TYPE_PREFERRED); aqMode->modeInfo = drmMode; + if (i == 1) + fallbackMode = aqMode; + output->modes.emplace_back(aqMode); if (currentModeInfo && std::memcmp(&drmMode, currentModeInfo, sizeof(drmModeModeInfo))) { @@ -1120,6 +1122,11 @@ void Aquamarine::SDRMConnector::connect(drmModeConnector* connector) { aqMode->preferred ? " (preferred)" : "")); } + if (!currentModeInfo) { + output->state->setMode(fallbackMode); + crtc->refresh = calculateRefresh(fallbackMode->modeInfo.value()); + } + output->physicalSize = {(double)connector->mmWidth, (double)connector->mmHeight}; backend->backend->log(AQ_LOG_DEBUG, std::format("drm: Physical size {} (mm)", output->physicalSize)); @@ -1181,7 +1188,7 @@ void Aquamarine::SDRMConnector::connect(drmModeConnector* connector) { return; output->swapchain = CSwapchain::create(backend->backend->primaryAllocator, backend->self.lock()); - backend->backend->events.newOutput.emit(output); + backend->backend->events.newOutput.emit(SP(output)); output->scheduleFrame(IOutput::AQ_SCHEDULE_NEW_CONNECTOR); } @@ -1400,7 +1407,7 @@ bool Aquamarine::CDRMOutput::commitState(bool onlyTest) { // fail to be created from gbm // TODO: add an API to detect this and request drm_dumb linear buffers. Or do something, // idk - if (data.cursorFB->buffer->dmabuf().modifier == DRM_FORMAT_MOD_INVALID) { + if (data.cursorFB->dead || data.cursorFB->buffer->dmabuf().modifier == DRM_FORMAT_MOD_INVALID) { TRACE(backend->backend->log(AQ_LOG_TRACE, "drm: Dropping invalid buffer for cursor plane")); data.cursorFB = nullptr; }