hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-12-20 12:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

disable buffer readability checks on intel (#11515)

Browse source 
* dmabuf: disable buffer read check on intel

readability checks directly on buffer fds on some intel laptops is
broken, see https://gitlab.freedesktop.org/drm/intel/-/issues/9415

* sync: use rvalue ref in addwaiter doonreadable

use rvalue reference in addwaiter and doonreadable, because we store the
function in the SReadableWaiter a lot of the time, move it into place
there when that happends or let it go out of scope after function call.
This commit is contained in:
Tom Englund 2025-08-24 09:57:37 +02:00 • committed by GitHub
parent d9cf1cb78e
commit ced38b1b0f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/helpers/sync/SyncTimeline.cpp
View file

@ -64,7 +64,7 @@ std::optional<bool> CSyncTimeline::check(uint64_t point, uint32_t flags) {
return ret == 0;
}
bool CSyncTimeline::addWaiter(const std::function<void()>& waiter, uint64_t point, uint32_t flags) {
bool CSyncTimeline::addWaiter(std::function<void()>&& waiter, uint64_t point, uint32_t flags) {
auto eventFd = CFileDescriptor(eventfd(0, EFD_CLOEXEC));
if (!eventFd.isValid()) {
@ -77,7 +77,7 @@ bool CSyncTimeline::addWaiter(const std::function<void()>& waiter, uint64_t poin
return false;
}
g_pEventLoopManager->doOnReadable(std::move(eventFd), waiter);
g_pEventLoopManager->doOnReadable(std::move(eventFd), std::move(waiter));
return true;
}

2
src/helpers/sync/SyncTimeline.hpp
View file

@ -25,7 +25,7 @@ class CSyncTimeline {
// std::nullopt on fail
std::optional<bool> check(uint64_t point, uint32_t flags);
bool addWaiter(const std::function<void()>& waiter, uint64_t point, uint32_t flags);
bool addWaiter(std::function<void()>&& waiter, uint64_t point, uint32_t flags);
Hyprutils::OS::CFileDescriptor exportAsSyncFileFD(uint64_t src);
bool importFromSyncFileFD(uint64_t dst, Hyprutils::OS::CFileDescriptor& fd);
bool transfer(SP<CSyncTimeline> from, uint64_t fromPoint, uint64_t toPoint);

4
src/managers/eventLoop/EventLoopManager.cpp
View file

@ -193,13 +193,13 @@ void CEventLoopManager::doLater(const std::function<void()>& fn) {
&m_idle);
}
void CEventLoopManager::doOnReadable(CFileDescriptor fd, const std::function<void()>& fn) {
void CEventLoopManager::doOnReadable(CFileDescriptor fd, std::function<void()>&& fn) {
if (!fd.isValid() || fd.isReadable()) {
fn();
return;
}
auto& waiter = m_readableWaiters.emplace_back(makeUnique<SReadableWaiter>(nullptr, std::move(fd), fn));
auto& waiter = m_readableWaiters.emplace_back(makeUnique<SReadableWaiter>(nullptr, std::move(fd), std::move(fn)));
waiter->source = wl_event_loop_add_fd(g_pEventLoopManager->m_wayland.loop, waiter->fd.get(), WL_EVENT_READABLE, ::handleWaiterFD, waiter.get());
}

2
src/managers/eventLoop/EventLoopManager.hpp
View file

@ -63,7 +63,7 @@ class CEventLoopManager {
// schedule function to when fd is readable (WL_EVENT_READABLE / POLLIN),
// takes ownership of fd
void doOnReadable(Hyprutils::OS::CFileDescriptor fd, const std::function<void()>& fn);
void doOnReadable(Hyprutils::OS::CFileDescriptor fd, std::function<void()>&& fn);
void onFdReadable(SReadableWaiter* waiter);
private:

4
src/protocols/DRMSyncobj.cpp
View file

@ -27,9 +27,9 @@ UP<CSyncReleaser> CDRMSyncPointState::createSyncRelease() {
return makeUnique<CSyncReleaser>(m_timeline, m_point);
}
bool CDRMSyncPointState::addWaiter(const std::function<void()>& waiter) {
bool CDRMSyncPointState::addWaiter(std::function<void()>&& waiter) {
m_acquireCommitted = true;
return m_timeline->addWaiter(waiter, m_point, 0u);
return m_timeline->addWaiter(std::move(waiter), m_point, 0u);
}
bool CDRMSyncPointState::committed() {

2
src/protocols/DRMSyncobj.hpp
View file

@ -20,7 +20,7 @@ class CDRMSyncPointState {
const uint64_t& point();
WP<CSyncTimeline> timeline();
Hyprutils::Memory::CUniquePointer<CSyncReleaser> createSyncRelease();
bool addWaiter(const std::function<void()>& waiter);
bool addWaiter(std::function<void()>&& waiter);
bool committed();
Hyprutils::OS::CFileDescriptor exportAsFD();
void signal();

4
src/protocols/core/Compositor.cpp
View file

@ -161,7 +161,7 @@ CWLSurfaceResource::CWLSurfaceResource(SP<CWlSurface> resource_) : m_resource(re
if (state->updated.bits.acquire) {
// wait on acquire point for this surface, from explicit sync protocol
state->acquire.addWaiter(whenReadable);
state->acquire.addWaiter(std::move(whenReadable));
} else if (state->buffer->isSynchronous()) {
// synchronous (shm) buffers can be read immediately
whenReadable();
@ -170,7 +170,7 @@ CWLSurfaceResource::CWLSurfaceResource(SP<CWlSurface> resource_) : m_resource(re
auto syncFd = dc<CDMABuffer*>(state->buffer.m_buffer.get())->exportSyncFile();
if (syncFd.isValid())
g_pEventLoopManager->doOnReadable(std::move(syncFd), whenReadable);
g_pEventLoopManager->doOnReadable(std::move(syncFd), std::move(whenReadable));
else
whenReadable();
} else {

4
src/protocols/types/DMABuffer.cpp
View file

@ -118,8 +118,12 @@ CFileDescriptor CDMABuffer::exportSyncFile() {
if (fd == -1)
continue;
// buffer readability checks are rather slow on some Intel laptops
// see https://gitlab.freedesktop.org/drm/intel/-/issues/9415
if (g_pHyprRenderer && !g_pHyprRenderer->isIntel()) {
if (CFileDescriptor::isReadable(fd))
continue;
}
dma_buf_export_sync_file request{
.flags = DMA_BUF_SYNC_READ,

8
src/render/Renderer.cpp
View file

@ -67,6 +67,8 @@ CHyprRenderer::CHyprRenderer() {
if (name.contains("nvidia"))
m_nvidia = true;
else if (name.contains("i915"))
m_intel = true;
Debug::log(LOG, "DRM driver information: {} v{}.{}.{} from {} description {}", name, DRMV->version_major, DRMV->version_minor, DRMV->version_patchlevel,
std::string{DRMV->date, DRMV->date_len}, std::string{DRMV->desc, DRMV->desc_len});
@ -85,6 +87,8 @@ CHyprRenderer::CHyprRenderer() {
if (name.contains("nvidia"))
m_nvidia = true;
else if (name.contains("i915"))
m_intel = true;
Debug::log(LOG, "Primary DRM driver information: {} v{}.{}.{} from {} description {}", name, DRMV->version_major, DRMV->version_minor, DRMV->version_patchlevel,
std::string{DRMV->date, DRMV->date_len}, std::string{DRMV->desc, DRMV->desc_len});
@ -2287,6 +2291,10 @@ bool CHyprRenderer::isNvidia() {
return m_nvidia;
}
bool CHyprRenderer::isIntel() {
return m_intel;
}
bool CHyprRenderer::isMgpu() {
return m_mgpu;
}

2
src/render/Renderer.hpp
View file

@ -74,6 +74,7 @@ class CHyprRenderer {
void onRenderbufferDestroy(CRenderbuffer* rb);
SP<CRenderbuffer> getCurrentRBO();
bool isNvidia();
bool isIntel();
bool isMgpu();
void makeEGLCurrent();
void unsetEGL();
@ -141,6 +142,7 @@ class CHyprRenderer {
SP<Aquamarine::IBuffer> m_currentBuffer = nullptr;
eRenderMode m_renderMode = RENDER_MODE_NORMAL;
bool m_nvidia = false;
bool m_intel = false;
bool m_mgpu = false;
struct {