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

platforms/drm: Move legacy cursor handling into DrmCrtc

Browse source 
Makes things easier for tiling and reduces the complexity of DrmPipeline
This commit is contained in:
Xaver Hugl 2021-09-22 15:57:57 +02:00
parent a70321c592
commit 3a9491ca6d
5 changed files with 72 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/plugins/platforms/drm/drm_object_crtc.cpp
View file

@ -82,4 +82,54 @@ int DrmCrtc::gammaRampSize() const
return m_crtc->gamma_size;
}
bool DrmCrtc::setLegacyCursor(const QSharedPointer<DrmDumbBuffer> buffer, const QPoint &hotspot)
{
if (m_cursor.bufferDirty || m_cursor.buffer != buffer || m_cursor.hotspot != hotspot) {
const QSize &s = buffer ? buffer->size() : QSize(64, 64);
int ret = drmModeSetCursor2(gpu()->fd(), id(), buffer ? buffer->handle() : 0, s.width(), s.height(), hotspot.x(), hotspot.y());
if (ret == -ENOTSUP) {
// for NVIDIA case that does not support drmModeSetCursor2
ret = drmModeSetCursor(gpu()->fd(), id(), buffer ? buffer->handle() : 0, s.width(), s.height());
}
if (ret != 0) {
qCWarning(KWIN_DRM) << "Could not set cursor:" << strerror(errno);
return false;
}
m_cursor.buffer = buffer;
m_cursor.bufferDirty = false;
m_cursor.hotspot = hotspot;
}
return true;
}
bool DrmCrtc::moveLegacyCursor(const QPoint &pos)
{
if (m_cursor.posDirty || m_cursor.pos != pos) {
if (drmModeMoveCursor(gpu()->fd(), id(), pos.x(), pos.y()) != 0) {
return false;
}
m_cursor.pos = pos;
m_cursor.posDirty = false;
}
return true;
}
void DrmCrtc::setLegacyCursor()
{
m_cursor.posDirty = true;
m_cursor.posDirty = true;
setLegacyCursor(m_cursor.buffer, m_cursor.hotspot);
moveLegacyCursor(m_cursor.pos);
}
bool DrmCrtc::isCursorVisible(const QRect &output) const
{
return m_cursor.buffer && QRect(m_cursor.pos, m_cursor.buffer->size()).intersects(output);
}
QPoint DrmCrtc::cursorPos() const
{
return m_cursor.pos;
}
}

15
src/plugins/platforms/drm/drm_object_crtc.h
View file

@ -12,6 +12,7 @@
#include "drm_object.h"
#include <QSharedPointer>
#include <QPoint>
namespace KWin
{
@ -48,11 +49,25 @@ public:
void setNext(const QSharedPointer<DrmBuffer> &buffer);
void flipBuffer();
bool setLegacyCursor(const QSharedPointer<DrmDumbBuffer> buffer, const QPoint &hotspot);
bool moveLegacyCursor(const QPoint &pos);
void setLegacyCursor();
bool isCursorVisible(const QRect &output) const;
QPoint cursorPos() const;
private:
DrmScopedPointer<drmModeCrtc> m_crtc;
QSharedPointer<DrmBuffer> m_currentBuffer;
QSharedPointer<DrmBuffer> m_nextBuffer;
int m_pipeIndex;
struct {
QPoint pos;
QPoint hotspot;
QSharedPointer<DrmDumbBuffer> buffer;
bool posDirty = true;
bool bufferDirty = true;
} m_cursor;
};
}

1
src/plugins/platforms/drm/drm_object_plane.h
View file

@ -18,6 +18,7 @@ namespace KWin
{
class DrmBuffer;
class DrmCrtc;
class DrmPlane : public DrmObject
{

40
src/plugins/platforms/drm/drm_pipeline.cpp
View file

@ -318,36 +318,12 @@ bool DrmPipeline::checkTestBuffer()
bool DrmPipeline::setCursor(const QSharedPointer<DrmDumbBuffer> &buffer, const QPoint &hotspot)
{
if (!m_cursor.dirtyBo && m_cursor.buffer == buffer && m_cursor.hotspot == hotspot) {
return true;
}
const QSize &s = buffer ? buffer->size() : QSize(64, 64);
int ret = drmModeSetCursor2(m_gpu->fd(), m_crtc->id(), buffer ? buffer->handle() : 0, s.width(), s.height(), hotspot.x(), hotspot.y());
if (ret == -ENOTSUP) {
// for NVIDIA case that does not support drmModeSetCursor2
ret = drmModeSetCursor(m_gpu->fd(), m_crtc->id(), buffer ? buffer->handle() : 0, s.width(), s.height());
}
if (ret != 0) {
qCWarning(KWIN_DRM) << "Could not set cursor:" << strerror(errno);
return false;
}
m_cursor.buffer = buffer;
m_cursor.dirtyBo = false;
m_cursor.hotspot = hotspot;
return true;
return m_crtc->setLegacyCursor(buffer, hotspot);
}
bool DrmPipeline::moveCursor(QPoint pos)
{
if (!m_cursor.dirtyPos && m_cursor.pos == pos) {
return true;
}
if (drmModeMoveCursor(m_gpu->fd(), m_crtc->id(), pos.x(), pos.y()) != 0) {
return false;
}
m_cursor.pos = pos;
m_cursor.dirtyPos = false;
return true;
return m_crtc->moveLegacyCursor(pos);
}
bool DrmPipeline::setActive(bool active)
@ -357,8 +333,6 @@ bool DrmPipeline::setActive(bool active)
if (drmModeSetCursor(m_gpu->fd(), m_crtc->id(), 0, 0, 0) != 0) {
qCWarning(KWIN_DRM) << "Could not set cursor:" << strerror(errno);
}
m_cursor.dirtyBo = true;
m_cursor.dirtyPos = true;
}
bool success = false;
auto mode = m_connector->currentMode().mode;
@ -385,8 +359,7 @@ bool DrmPipeline::setActive(bool active)
}
if (isActive()) {
// enable cursor (again)
setCursor(m_cursor.buffer, m_cursor.hotspot);
moveCursor(m_cursor.pos);
m_crtc->setLegacyCursor();
}
return success;
}
@ -505,12 +478,12 @@ bool DrmPipeline::isActive() const
bool DrmPipeline::isCursorVisible() const
{
return m_cursor.buffer && QRect(m_cursor.pos, m_cursor.buffer->size()).intersects(QRect(QPoint(0, 0), m_connector->currentMode().size));
return m_crtc->isCursorVisible(QRect(QPoint(0, 0), m_connector->currentMode().size));
}
QPoint DrmPipeline::cursorPos() const
{
return m_cursor.pos;
return m_crtc->cursorPos();
}
DrmConnector *DrmPipeline::connector() const
@ -553,8 +526,7 @@ void DrmPipeline::updateProperties()
}
// with legacy we don't know what happened to the cursor after VT switch
// so make sure it gets set again
m_cursor.dirtyBo = true;
m_cursor.dirtyPos = true;
m_crtc->setLegacyCursor();
}
bool DrmPipeline::isFormatSupported(uint32_t drmFormat) const

7
src/plugins/platforms/drm/drm_pipeline.h
View file

@ -103,13 +103,6 @@ private:
QSharedPointer<DrmBuffer> m_oldTestBuffer;
bool m_legacyNeedsModeset = true;
struct {
QPoint pos;
QPoint hotspot;
QSharedPointer<DrmDumbBuffer> buffer;
bool dirtyBo = true;
bool dirtyPos = true;
} m_cursor;
QVector<DrmObject*> m_allObjects;
QMap<uint32_t, QVector<uint64_t>> m_formats;