AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eglfs/kms: make sure eglfs plane is always consistent

Browse Source 
We need to make sure we update the eglfs plane properly even
when we are forcing the rendering plane index.

Change-Id: I0cd19fbc53c34f28d55708ba2c8e84278e1d7e7d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Lionel CHAZALLON 2018-03-18 10:04:55 +01:00
parent 2cd4123661
commit 2c7727a225
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/platformsupport/kmsconvenience/qkmsdevice.cpp
View File

@ -409,9 +409,6 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
qCDebug(qLcKmsDebug, "Output %s can use %d planes: %s",
connectorName.constData(), output.available_planes.count(), qPrintable(planeListStr));
if (output.eglfs_plane)
qCDebug(qLcKmsDebug, "Output eglfs plane is: %d", output.eglfs_plane->id);
// This is for the EGLDevice/EGLStream backend. On some of those devices one
// may want to target a pre-configured plane. It is probably useless for
// eglfs_kms and others. Do not confuse with generic plane support (available_planes).
@ -427,6 +424,12 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
output.forced_plane_id = plane->plane_id;
qCDebug(qLcKmsDebug, "Forcing plane index %d, plane id %u (belongs to crtc id %u)",
idx, plane->plane_id, plane->crtc_id);
for (const QKmsPlane &kmsplane : qAsConst(m_planes)) {
if (kmsplane.id == output.forced_plane_id)
output.eglfs_plane = (QKmsPlane*)&kmsplane;
}
drmModeFreePlane(plane);
}
} else {
@ -435,6 +438,9 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
}
}
if (output.eglfs_plane)
qCDebug(qLcKmsDebug, "Output eglfs plane is: %d", output.eglfs_plane->id);
m_crtc_allocator |= (1 << output.crtc_index);
vinfo->output = output;