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

dmabuf: Use RamFile for passing dmabuf feedback table to clients

Browse source 
This uses a sealed anonymous file (memfd) instead of a `QTemporaryFile`,
which is more efficient.

Signed-off-by: Victoria Fischer <victoria.fischer@mbition.io>
This commit is contained in:
Kai Uwe Broulik 2022-08-16 16:11:09 +02:00 committed by Kai Uwe Broulik
parent 50ae65809e
commit 7e33e85cde
2 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/wayland/linuxdmabufv1clientbuffer.cpp
View file

@ -15,7 +15,6 @@
#include "surface_interface_p.h" #include "surface_interface_p.h"
#include "utils/common.h" #include "utils/common.h"
#include <QTemporaryFile>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
@ -440,7 +439,7 @@ LinuxDmaBufV1FeedbackPrivate::LinuxDmaBufV1FeedbackPrivate(LinuxDmaBufV1ClientBu
void LinuxDmaBufV1FeedbackPrivate::send(Resource *resource) void LinuxDmaBufV1FeedbackPrivate::send(Resource *resource)
{ {
send_format_table(resource->handle, m_bufferintegration->table->fd.get(), m_bufferintegration->table->size); send_format_table(resource->handle, m_bufferintegration->table->file.fd(), m_bufferintegration->table->file.size());
QByteArray bytes; QByteArray bytes;
bytes.append(reinterpret_cast<const char *>(&m_bufferintegration->mainDevice), sizeof(dev_t)); bytes.append(reinterpret_cast<const char *>(&m_bufferintegration->mainDevice), sizeof(dev_t));
send_main_device(resource->handle, bytes); send_main_device(resource->handle, bytes);
@ -500,28 +499,13 @@ LinuxDmaBufV1FormatTable::LinuxDmaBufV1FormatTable(const QHash<uint32_t, QVector
data.append({format, 0, mod}); data.append({format, 0, mod});
} }
} }
size = data.size() * sizeof(linux_dmabuf_feedback_v1_table_entry);
std::unique_ptr<QTemporaryFile> tmp(new QTemporaryFile()); const auto size = data.size() * sizeof(linux_dmabuf_feedback_v1_table_entry);
if (!tmp->open()) { file = KWin::RamFile("kwin-dmabuf-feedback-table", data.constData(), size, KWin::RamFile::Flag::SealWrite);
qCWarning(KWIN_CORE) << "Failed to create keymap file:" << tmp->errorString(); if (!file.isValid()) {
qCCritical(KWIN_CORE) << "Failed to create RamFile for LinuxDmaBufV1FormatTable";
return; return;
} }
fd = KWin::FileDescriptor(open(tmp->fileName().toUtf8().constData(), O_RDONLY | O_CLOEXEC));
if (!fd.isValid()) {
qCWarning(KWIN_CORE) << "Could not create readonly shm fd!" << strerror(errno);
return;
}
unlink(tmp->fileName().toUtf8().constData());
if (!tmp->resize(size)) {
qCWarning(KWIN_CORE) << "Failed to resize keymap file:" << tmp->errorString();
return;
}
uchar *address = tmp->map(0, size);
if (!address) {
qCWarning(KWIN_CORE) << "Failed to map keymap file:" << tmp->errorString();
return;
}
memcpy(address, data.data(), size);
} }
} // namespace KWaylandServer } // namespace KWaylandServer

4
src/wayland/linuxdmabufv1clientbuffer_p.h
View file

@ -14,6 +14,7 @@
#include "display.h" #include "display.h"
#include "display_p.h" #include "display_p.h"
#include "linuxdmabufv1clientbuffer.h" #include "linuxdmabufv1clientbuffer.h"
#include "utils/ramfile.h"
#include "qwayland-server-linux-dmabuf-unstable-v1.h" #include "qwayland-server-linux-dmabuf-unstable-v1.h"
#include "qwayland-server-wayland.h" #include "qwayland-server-wayland.h"
@ -91,8 +92,7 @@ class LinuxDmaBufV1FormatTable
public: public:
LinuxDmaBufV1FormatTable(const QHash<uint32_t, QVector<uint64_t>> &supportedModifiers); LinuxDmaBufV1FormatTable(const QHash<uint32_t, QVector<uint64_t>> &supportedModifiers);
KWin::FileDescriptor fd; KWin::RamFile file;
int size;
QMap<std::pair<uint32_t, uint64_t>, uint16_t> indices; QMap<std::pair<uint32_t, uint64_t>, uint16_t> indices;
}; };