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

backends/drm: fix handling of implicit modifiers

Browse source
This commit is contained in:
Xaver Hugl 2023-07-10 17:07:08 +02:00
parent 0155ede2a5
commit d6c29e2688
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/backends/drm/drm_pipeline.cpp
View file

@ -30,8 +30,9 @@
namespace KWin
{
static const QMap<uint32_t, QVector<uint64_t>> legacyFormats = {{DRM_FORMAT_XRGB8888, {}}};
static const QMap<uint32_t, QVector<uint64_t>> legacyCursorFormats = {{DRM_FORMAT_ARGB8888, {}}};
static const QVector<uint64_t> implicitModifier = {DRM_FORMAT_MOD_INVALID};
static const QMap<uint32_t, QVector<uint64_t>> legacyFormats = {{DRM_FORMAT_XRGB8888, implicitModifier}};
static const QMap<uint32_t, QVector<uint64_t>> legacyCursorFormats = {{DRM_FORMAT_ARGB8888, implicitModifier}};
DrmPipeline::DrmPipeline(DrmConnector *conn)
: m_connector(conn)
@ -450,16 +451,14 @@ QMap<uint32_t, QVector<uint64_t>> DrmPipeline::cursorFormats() const
bool DrmPipeline::pruneModifier()
{
const DmaBufAttributes *dmabufAttributes = m_pending.layer->currentBuffer() ? m_pending.layer->currentBuffer()->buffer()->dmabufAttributes() : nullptr;
if (!dmabufAttributes
|| dmabufAttributes->modifier == DRM_FORMAT_MOD_NONE
|| dmabufAttributes->modifier == DRM_FORMAT_MOD_INVALID) {
if (!dmabufAttributes) {
return false;
}
auto &modifiers = m_pending.formats[dmabufAttributes->format];
if (modifiers.empty()) {
if (modifiers == implicitModifier) {
return false;
} else {
modifiers.clear();
modifiers = implicitModifier;
return true;
}
}

11
src/backends/drm/drm_plane.cpp
View file

@ -95,13 +95,14 @@ bool DrmPlane::updateProperties()
m_supportedFormats[iterator.fmt].push_back(iterator.mod);
}
} else {
const QVector<uint64_t> modifiers = {DRM_FORMAT_MOD_INVALID};
for (uint32_t i = 0; i < p->count_formats; i++) {
m_supportedFormats.insert(p->formats[i], {DRM_FORMAT_MOD_LINEAR});
m_supportedFormats.insert(p->formats[i], modifiers);
}
if (m_supportedFormats.isEmpty()) {
qCWarning(KWIN_DRM) << "Driver doesn't advertise any formats for this plane. Falling back to XRGB8888 without explicit modifiers";
m_supportedFormats.insert(DRM_FORMAT_XRGB8888, modifiers);
}
}
if (m_supportedFormats.isEmpty()) {
qCWarning(KWIN_DRM) << "Driver doesn't advertise any formats for this plane. Falling back to XRGB8888 without explicit modifiers";
m_supportedFormats.insert(DRM_FORMAT_XRGB8888, {});
}
return true;
}