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

platforms/drm: commit pipelines directly instead of testing

Browse source 
The current behavior seems to cause some issues, and this is faster and
more efficient.
This commit is contained in:
Xaver Hugl 2021-09-09 11:27:10 +02:00
parent 748004d81e
commit ffc4c12548
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/plugins/platforms/drm/drm_gpu.cpp
View file

@ -238,12 +238,10 @@ bool DrmGpu::updateOutputs()
return c1->getProp(DrmConnector::PropertyIndex::CrtcId)->current() > c2->getProp(DrmConnector::PropertyIndex::CrtcId)->current();
});
}
auto config = findWorkingCombination({}, connectedConnectors, m_crtcs, m_planes);
DrmPipeline::commitPipelines(config, DrmPipeline::CommitMode::Commit);
const auto config = findWorkingCombination({}, connectedConnectors, m_crtcs, m_planes);
m_pipelines << config;
for (const auto &pipeline : qAsConst(config)) {
for (const auto &pipeline : config) {
auto output = pipeline->output();
if (m_outputs.contains(output)) {
// try setting hardware rotation
@ -267,7 +265,7 @@ QVector<DrmPipeline *> DrmGpu::findWorkingCombination(const QVector<DrmPipeline
{
if (connectors.isEmpty() || crtcs.isEmpty()) {
// no further pipelines can be added -> test configuration
if (testCombination(pipelines)) {
if (commitCombination(pipelines)) {
return pipelines;
} else {
return {};
@ -324,7 +322,7 @@ QVector<DrmPipeline *> DrmGpu::findWorkingCombination(const QVector<DrmPipeline
return {};
}
bool DrmGpu::testCombination(const QVector<DrmPipeline *> &pipelines)
bool DrmGpu::commitCombination(const QVector<DrmPipeline *> &pipelines)
{
for (const auto &pipeline : pipelines) {
auto output = findOutput(pipeline->connector()->id());
@ -338,7 +336,7 @@ bool DrmGpu::testCombination(const QVector<DrmPipeline *> &pipelines)
pipeline->setup();
}
if (DrmPipeline::commitPipelines(pipelines, DrmPipeline::CommitMode::Test)) {
if (DrmPipeline::commitPipelines(pipelines, DrmPipeline::CommitMode::Commit)) {
return true;
} else {
for (const auto &pipeline : qAsConst(pipelines)) {

2
src/plugins/platforms/drm/drm_gpu.h
View file

@ -120,7 +120,7 @@ private:
void initDrmResources();
QVector<DrmPipeline *> findWorkingCombination(const QVector<DrmPipeline *> &pipelines, QVector<DrmConnector *> connectors, QVector<DrmCrtc *> crtcs, const QVector<DrmPlane *> &planes);
bool testCombination(const QVector<DrmPipeline *> &pipelines);
bool commitCombination(const QVector<DrmPipeline *> &pipelines);
DrmBackend* const m_backend;
QPointer<AbstractEglDrmBackend> m_eglBackend;