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

backends/drm: allow modesets with atomic tests if a modeset is already pending

Browse source 
Otherwise the tests will always fail

BUG: 461657
This commit is contained in:
Xaver Hugl 2023-08-02 11:45:07 +02:00
parent 8feeb9b023
commit befb50ebec
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,16 @@ DrmPipeline::Error DrmPipeline::commitPipelines(const QVector<DrmPipeline *> &pi
DrmPipeline::Error DrmPipeline::commitPipelinesAtomic(const QVector<DrmPipeline *> &pipelines, CommitMode mode, const QVector<DrmObject *> &unusedObjects) DrmPipeline::Error DrmPipeline::commitPipelinesAtomic(const QVector<DrmPipeline *> &pipelines, CommitMode mode, const QVector<DrmObject *> &unusedObjects)
{ {
auto commit = std::make_unique<DrmAtomicCommit>(pipelines); auto commit = std::make_unique<DrmAtomicCommit>(pipelines);
if (mode == CommitMode::Test) {
// if there's a modeset pending, the tests on top of that state
// also have to allow modesets or they'll always fail
const bool wantsModeset = std::any_of(pipelines.begin(), pipelines.end(), [](DrmPipeline *pipeline) {
return pipeline->needsModeset();
});
if (wantsModeset) {
mode = CommitMode::TestAllowModeset;
}
}
for (const auto &pipeline : pipelines) { for (const auto &pipeline : pipelines) {
if (pipeline->activePending()) { if (pipeline->activePending()) {
if (!pipeline->m_pending.layer->checkTestBuffer()) { if (!pipeline->m_pending.layer->checkTestBuffer()) {