Unverified Commit 4d46edd7 authored by Oleg `Kanedias` Chernovskiy's avatar Oleg `Kanedias` Chernovskiy Committed by Oleg Chernovskiy
Browse files

GBM remote access support for KWin

Summary:
Implements a KWayland protocol to pass GBM fd from KWin to KRfb and
addictions to relevant projects from both sides.

Note that this patch does not affect default behaviour of mentioned projects. It can be used
only with KWIN_REMOTE=1 in env from KWin side and with preferredFrameBufferPlugin=gbm in krfbrc from
KRfb side. In all other aspects app behaviour remains unchanged.

Test Plan: Launched KWin in Wayland mode, launched KRfb in it, launched KRDC on a laptop, connected in read-only mode, observed a correctly retrieved desktop with Krfb window

Reviewers: graesslin, davidedmundson, romangg, #kwin

Reviewed By: davidedmundson, romangg, #kwin

Subscribers: kossebau, jgrulich, romangg, ngraham, alexeymin, aacid, kwin, #kwin, davidedmundson, plasma-devel

Tags: #plasma_on_wayland, #kwin

Maniphest Tasks: T5653, T7785

Differential Revision: https://phabricator.kde.org/D1230
parent e3f0b537
......@@ -13,7 +13,12 @@ set(DRM_SOURCES
)
if(HAVE_GBM)
set(DRM_SOURCES ${DRM_SOURCES} egl_gbm_backend.cpp drm_buffer_gbm.cpp gbm_surface.cpp)
set(DRM_SOURCES ${DRM_SOURCES}
egl_gbm_backend.cpp
drm_buffer_gbm.cpp
gbm_surface.cpp
remoteaccess_manager.cpp
)
endif()
include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
......
......@@ -49,6 +49,11 @@ public:
bool hasBo() const {
return m_bo != nullptr;
}
gbm_bo* getBo() const {
return m_bo;
}
void releaseGbm() override;
private:
......
......@@ -131,6 +131,10 @@ public:
return m_orientation;
}
const QPointer<KWayland::Server::OutputInterface> getWaylandInterface() const {
return m_waylandOutput;
}
Q_SIGNALS:
void dpmsChanged();
void modeChanged();
......
......@@ -130,6 +130,7 @@ void EglGbmBackend::init()
initKWinGL();
initBufferAge();
initWayland();
initRemotePresent();
}
bool EglGbmBackend::initRenderingContext()
......@@ -154,6 +155,16 @@ bool EglGbmBackend::initRenderingContext()
return makeContextCurrent(m_outputs.first());
}
void EglGbmBackend::initRemotePresent()
{
if (qEnvironmentVariableIsSet("KWIN_NO_REMOTE")) {
return;
}
qCDebug(KWIN_DRM) << "Support for remote access enabled";
m_remoteaccessManager.reset(new RemoteAccessManager);
}
bool EglGbmBackend::resetOutput(Output &o, DrmOutput *drmOutput)
{
o.output = drmOutput;
......@@ -272,7 +283,13 @@ void EglGbmBackend::presentOnOutput(EglGbmBackend::Output &o)
{
eglSwapBuffers(eglDisplay(), o.eglSurface);
o.buffer = m_backend->createBuffer(o.gbmSurface);
if(m_remoteaccessManager && gbm_surface_has_free_buffers(o.gbmSurface->surface())) {
// GBM surface is released on page flip so
// we should pass the buffer before it's presented
m_remoteaccessManager->passBuffer(o.output, o.buffer);
}
m_backend->present(o.buffer, o.output);
if (supportsBufferAge()) {
eglQuerySurface(eglDisplay(), o.eglSurface, EGL_BUFFER_AGE_EXT, &o.bufferAge);
}
......
......@@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef KWIN_EGL_GBM_BACKEND_H
#define KWIN_EGL_GBM_BACKEND_H
#include "abstract_egl_backend.h"
#include "remoteaccess_manager.h"
#include <memory>
......@@ -59,6 +60,7 @@ private:
bool initializeEgl();
bool initBufferConfigs();
bool initRenderingContext();
void initRemotePresent();
struct Output {
DrmOutput *output = nullptr;
DrmBuffer *buffer = nullptr;
......@@ -77,6 +79,7 @@ private:
void createOutput(DrmOutput *output);
DrmBackend *m_backend;
QVector<Output> m_outputs;
QScopedPointer<RemoteAccessManager> m_remoteaccessManager;
friend class EglGbmTexture;
};
......
/********************************************************************
*
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "drm_output.h"
#include "remoteaccess_manager.h"
#include "logging.h"
#include "drm_backend.h"
#include "../../../wayland_server.h"
// system
#include <KWayland/Server/output_interface.h>
#include <unistd.h>
#include <gbm.h>
namespace KWin
{
RemoteAccessManager::RemoteAccessManager(QObject *parent)
: QObject(parent)
{
if (waylandServer()) {
m_interface = waylandServer()->display()->createRemoteAccessManager(this);
m_interface->create();
connect(m_interface, &RemoteAccessManagerInterface::bufferReleased,
this, &RemoteAccessManager::releaseBuffer);
}
}
RemoteAccessManager::~RemoteAccessManager()
{
if (m_interface) {
m_interface->destroy();
}
}
void RemoteAccessManager::releaseBuffer(const BufferHandle *buf)
{
int ret = close(buf->fd());
if (Q_UNLIKELY(ret)) {
qCWarning(KWIN_DRM) << "Couldn't close released GBM fd:" << strerror(errno);
}
delete buf;
}
void RemoteAccessManager::passBuffer(DrmOutput *output, DrmBuffer *buffer)
{
DrmSurfaceBuffer* gbmbuf = static_cast<DrmSurfaceBuffer *>(buffer);
// no connected RemoteAccess instance
if (!m_interface || !m_interface->isBound()) {
return;
}
// first buffer may be null
if (!gbmbuf || !gbmbuf->hasBo()) {
return;
}
auto buf = new BufferHandle;
auto bo = gbmbuf->getBo();
buf->setFd(gbm_bo_get_fd(bo));
buf->setSize(gbm_bo_get_width(bo), gbm_bo_get_height(bo));
buf->setStride(gbm_bo_get_stride(bo));
buf->setFormat(gbm_bo_get_format(bo));
m_interface->sendBufferReady(output->getWaylandInterface().data(), buf);
}
} // KWin namespace
/********************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2016 Oleg Chernovskiy <kanedias@xaker.ru>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#ifndef REMOTEACCESSMANAGER_H
#define REMOTEACCESSMANAGER_H
// KWayland
#include <KWayland/Server/display.h>
#include <KWayland/Server/remote_access_interface.h>
// Qt
#include <QObject>
struct gbm_bo;
struct gbm_surface;
namespace KWin
{
class DrmOutput;
class DrmBuffer;
using KWayland::Server::RemoteAccessManagerInterface;
using KWayland::Server::BufferHandle;
class RemoteAccessManager : public QObject
{
Q_OBJECT
public:
explicit RemoteAccessManager(QObject *parent = nullptr);
virtual ~RemoteAccessManager();
void passBuffer(DrmOutput *output, DrmBuffer *buffer);
signals:
void bufferNoLongerNeeded(qint32 gbm_handle);
private:
void releaseBuffer(const BufferHandle *buf);
RemoteAccessManagerInterface *m_interface = nullptr;
};
} // KWin namespace
#endif // REMOTEACCESSMANAGER_H
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment