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

platforms/drm: prevent having zero outputs at any time

Browse source 
Instead of updating all outputs first, create the placeholder output
before the last output gets removed.
This commit is contained in:
Xaver Hugl 2021-08-30 14:59:46 +02:00
parent 2696030b00
commit dbf4a59527
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/plugins/platforms/drm/drm_backend.cpp
View file

@ -334,10 +334,21 @@ void DrmBackend::addOutput(DrmAbstractOutput *o)
m_enabledOutputs.append(o); m_enabledOutputs.append(o);
Q_EMIT outputAdded(o); Q_EMIT outputAdded(o);
Q_EMIT outputEnabled(o); Q_EMIT outputEnabled(o);
if (m_placeHolderOutput) {
qCDebug(KWIN_DRM) << "removing placeholder output";
primaryGpu()->removeVirtualOutput(m_placeHolderOutput);
m_placeHolderOutput = nullptr;
}
} }
void DrmBackend::removeOutput(DrmAbstractOutput *o) void DrmBackend::removeOutput(DrmAbstractOutput *o)
{ {
if (m_outputs.count() == 1 && !kwinApp()->isTerminating()) {
qCDebug(KWIN_DRM) << "adding placeholder output";
m_placeHolderOutput = primaryGpu()->createVirtualOutput();
// placeholder doesn't actually need to render anything
m_placeHolderOutput->renderLoop()->inhibit();
}
if (m_enabledOutputs.removeOne(o)) { if (m_enabledOutputs.removeOne(o)) {
Q_EMIT outputDisabled(o); Q_EMIT outputDisabled(o);
} }
@ -366,10 +377,6 @@ void DrmBackend::updateOutputs()
m_placeHolderOutput = primaryGpu()->createVirtualOutput(); m_placeHolderOutput = primaryGpu()->createVirtualOutput();
// placeholder doesn't actually need to render anything // placeholder doesn't actually need to render anything
m_placeHolderOutput->renderLoop()->inhibit(); m_placeHolderOutput->renderLoop()->inhibit();
} else if (m_placeHolderOutput && m_outputs.count() > 1) {
qCDebug(KWIN_DRM) << "removing placeholder output";
primaryGpu()->removeVirtualOutput(m_placeHolderOutput);
m_placeHolderOutput = nullptr;
} }
std::sort(m_outputs.begin(), m_outputs.end(), [] (DrmAbstractOutput *a, DrmAbstractOutput *b) { std::sort(m_outputs.begin(), m_outputs.end(), [] (DrmAbstractOutput *a, DrmAbstractOutput *b) {

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

@ -38,7 +38,6 @@ class KWIN_EXPORT DrmOutput : public DrmAbstractOutput
{ {
Q_OBJECT Q_OBJECT
public: public:
///deletes the output, calling this whilst a page flip is pending will result in an error
~DrmOutput() override; ~DrmOutput() override;
bool initCursor(const QSize &cursorSize) override; bool initCursor(const QSize &cursorSize) override;