1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: Fix having more than window over the screen's lifetime

Browse Source 
...when not using atomic.

On the non-atmic path the fb is passed in to drmModeSetCrtc.
Here we need a new call to it if a new QWindow gets created
after the previous one is destroyed. Previously this was
not done, so it ended up with Device busy errors. Atomic
does not need this since there the flip commit always
contains framebufferPropertyId.

Change-Id: Ie68152cad50438807ef45adfba65e74c8f30c956
Fixes: QTBUG-122663
Pick-to: 6.6 6.5
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 818f8de64a2b1a7371ecb4bdd527b05343190582)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Laszlo Agocs 2024-03-04 17:53:23 +01:00 committed by Qt Cherry-pick Bot
parent e3b2386dd7
commit bdf324871a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
View File

@ -184,6 +184,11 @@ void QEglFSKmsGbmScreen::resetSurface()
// still do its work, when called. Otherwise we end up // still do its work, when called. Otherwise we end up
// in device-is-busy errors if there is a new QWindow // in device-is-busy errors if there is a new QWindow
// created afterwards. (QTBUG-122663) // created afterwards. (QTBUG-122663)
// If not using atomic, will need a new drmModeSetCrtc if a new window
// gets created later on (and so there's a new fb).
if (!device()->hasAtomicSupport())
needsNewModeSetForNextFb = true;
} }
void QEglFSKmsGbmScreen::initCloning(QPlatformScreen *screenThisScreenClones, void QEglFSKmsGbmScreen::initCloning(QPlatformScreen *screenThisScreenClones,
@ -213,8 +218,9 @@ void QEglFSKmsGbmScreen::ensureModeSet(uint32_t fb)
QKmsOutput &op(output()); QKmsOutput &op(output());
const int fd = device()->fd(); const int fd = device()->fd();
if (!op.mode_set) { if (!op.mode_set || needsNewModeSetForNextFb) {
op.mode_set = true; op.mode_set = true;
needsNewModeSetForNextFb = false;
bool doModeSet = true; bool doModeSet = true;
drmModeCrtcPtr currentMode = drmModeGetCrtc(fd, op.crtc_id); drmModeCrtcPtr currentMode = drmModeGetCrtc(fd, op.crtc_id);

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen_p.h
View File

@ -83,6 +83,8 @@ protected:
bool cloneFlipPending = false; bool cloneFlipPending = false;
}; };
QList<CloneDestination> m_cloneDests; QList<CloneDestination> m_cloneDests;
bool needsNewModeSetForNextFb = false;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE