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

backends/drm: don't cache formats

Browse source 
While it could be useful with tiled displays, the isFormatSupported and
supportedModifier functions can be called before prepareModeset, so where
m_formats is still empty. Additionally they're neither in a hot path nor
performance critical.
This commit is contained in:
Xaver Hugl 2021-11-10 16:18:53 +01:00
parent 1f79f421b4
commit f097440eb4
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,10 +34,6 @@ DrmPipeline::DrmPipeline(DrmConnector *conn)
: m_output(nullptr)
, m_connector(conn)
{
if (!gpu()->atomicModeSetting()) {
m_formats.insert(DRM_FORMAT_XRGB8888, {});
m_formats.insert(DRM_FORMAT_ARGB8888, {});
}
}
DrmPipeline::~DrmPipeline()
@ -348,8 +344,6 @@ void DrmPipeline::prepareModeset()
pending.crtc->primaryPlane()->setPending(DrmPlane::PropertyIndex::CrtcId, activePending() ? pending.crtc->id() : 0);
pending.crtc->primaryPlane()->setTransformation(DrmPlane::Transformation::Rotate0);
pending.crtc->primaryPlane()->set(QPoint(0, 0), sourceSize(), QPoint(0, 0), mode->size());
m_formats = pending.crtc->primaryPlane()->formats();
}
void DrmPipeline::applyPendingChanges()
@ -466,12 +460,24 @@ DrmOutput *DrmPipeline::output() const
bool DrmPipeline::isFormatSupported(uint32_t drmFormat) const
{
return m_formats.contains(drmFormat);
if (pending.crtc) {
if (pending.crtc->primaryPlane()) {
return pending.crtc->primaryPlane()->formats().contains(drmFormat);
} else {
return drmFormat == DRM_FORMAT_XRGB8888 || drmFormat == DRM_FORMAT_ARGB8888;
}
} else {
return false;
}
}
QVector<uint64_t> DrmPipeline::supportedModifiers(uint32_t drmFormat) const
{
return m_formats[drmFormat];
if (pending.crtc && pending.crtc->primaryPlane()) {
return pending.crtc->primaryPlane()->formats()[drmFormat];
} else {
return {};
}
}
bool DrmPipeline::needsModeset() const

2
src/backends/drm/drm_pipeline.h
View file

@ -132,8 +132,6 @@ private:
bool m_pageflipPending = false;
bool m_modesetPresentPending = false;
QMap<uint32_t, QVector<uint64_t>> m_formats;
// the state that will be applied at the next real atomic commit
State m_next;
// the state that is already committed