whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eglfs_kms: Add support for formats other than XRGB8888 

Switch to drmModeAddFB2 and add mappings for RGB565 and ARGB8888,
and some BGR variants.

The default is XRGB8888, like before.

Others can be requested in the config file with
"format": "rgb565" or "argb8888" etc. on a per-output basis.

If the primary plane does not support the format, modesetting
and flipping will fail.

Task-number: QTBUG-62262
Change-Id: I8537cbeed7f046c46aa63fcea6d6946c0e0038a7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
bb10
Laszlo Agocs 2017-08-02 16:39:48 +02:00
parent 77a70b2195
commit bca297030c
4 changed files with 76 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,6 +324,34 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
}
qCDebug(qLcKmsDebug) << "Physical size is" << physSize << "mm" << "for output" << connectorName;
const QByteArray formatStr = userConnectorConfig.value(QStringLiteral("format"), QStringLiteral("xrgb8888"))
.toByteArray().toLower();
uint32_t drmFormat;
if (formatStr == "xrgb8888") {
drmFormat = DRM_FORMAT_XRGB8888;
} else if (formatStr == "xbgr8888") {
drmFormat = DRM_FORMAT_XBGR8888;
} else if (formatStr == "argb8888") {
drmFormat = DRM_FORMAT_ARGB8888;
} else if (formatStr == "abgr8888") {
drmFormat = DRM_FORMAT_ABGR8888;
} else if (formatStr == "rgb565") {
drmFormat = DRM_FORMAT_RGB565;
} else if (formatStr == "bgr565") {
drmFormat = DRM_FORMAT_BGR565;
} else if (formatStr == "xrgb2101010") {
drmFormat = DRM_FORMAT_XRGB2101010;
} else if (formatStr == "xbgr2101010") {
drmFormat = DRM_FORMAT_XBGR2101010;
} else if (formatStr == "argb2101010") {
drmFormat = DRM_FORMAT_ARGB2101010;
} else if (formatStr == "abgr2101010") {
drmFormat = DRM_FORMAT_ABGR2101010;
} else {
qWarning("Invalid pixel format \"%s\" for output %s", formatStr.constData(), connectorName.constData());
drmFormat = DRM_FORMAT_XRGB8888;
}
QKmsOutput output = {
QString::fromUtf8(connectorName),
connector->connector_id,
@ -339,7 +367,8 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
connectorPropertyBlob(connector, QByteArrayLiteral("EDID")),
false, // wants_plane
0, // plane_id
false // plane_set
false, // plane_set
drmFormat
};
bool ok;

2
src/platformsupport/kmsconvenience/qkmsdevice_p.h
View File

@ -59,6 +59,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
#include <drm_fourcc.h>
QT_BEGIN_NAMESPACE
@ -111,6 +112,7 @@ struct QKmsOutput
bool wants_plane;
uint32_t plane_id;
bool plane_set;
uint32_t drm_format;
void restoreMode(QKmsDevice *device);
void cleanup(QKmsDevice *device);

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

@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Copyright (C) 2015 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
@ -55,6 +55,18 @@ QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(qLcEglfsKmsDebug)
static inline uint32_t drmFormatToGbmFormat(uint32_t drmFormat)
{
Q_ASSERT(DRM_FORMAT_XRGB8888 == GBM_FORMAT_XRGB8888);
return drmFormat;
}
static inline uint32_t gbmFormatToDrmFormat(uint32_t gbmFormat)
{
Q_ASSERT(DRM_FORMAT_XRGB8888 == GBM_FORMAT_XRGB8888);
return gbmFormat;
}
void QEglFSKmsGbmScreen::bufferDestroyedHandler(gbm_bo *bo, void *data)
{
FrameBuffer *fb = static_cast<FrameBuffer *>(data);
@ -77,13 +89,16 @@ QEglFSKmsGbmScreen::FrameBuffer *QEglFSKmsGbmScreen::framebufferForBufferObject(
uint32_t width = gbm_bo_get_width(bo);
uint32_t height = gbm_bo_get_height(bo);
uint32_t stride = gbm_bo_get_stride(bo);
uint32_t handle = gbm_bo_get_handle(bo).u32;
uint32_t handles[4] = { gbm_bo_get_handle(bo).u32 };
uint32_t strides[4] = { gbm_bo_get_stride(bo) };
uint32_t offsets[4] = { 0 };
uint32_t pixelFormat = gbmFormatToDrmFormat(gbm_bo_get_format(bo));
QScopedPointer<FrameBuffer> fb(new FrameBuffer);
qCDebug(qLcEglfsKmsDebug, "Adding FB, size %ux%u, DRM format 0x%x", width, height, pixelFormat);
int ret = drmModeAddFB(device()->fd(), width, height, 24, 32,
stride, handle, &fb->fb);
int ret = drmModeAddFB2(device()->fd(), width, height, pixelFormat,
handles, strides, offsets, &fb->fb, 0);
if (ret) {
qWarning("Failed to create KMS FB!");
@ -132,11 +147,12 @@ QPlatformCursor *QEglFSKmsGbmScreen::cursor() const
gbm_surface *QEglFSKmsGbmScreen::createSurface()
{
if (!m_gbm_surface) {
qCDebug(qLcEglfsKmsDebug, "Creating gbm_surface for screen %s", qPrintable(name()));
uint32_t gbmFormat = drmFormatToGbmFormat(m_output.drm_format);
qCDebug(qLcEglfsKmsDebug, "Creating gbm_surface for screen %s with format 0x%x", qPrintable(name()), gbmFormat);
m_gbm_surface = gbm_surface_create(static_cast<QEglFSKmsGbmDevice *>(device())->gbmDevice(),
rawGeometry().width(),
rawGeometry().height(),
GBM_FORMAT_XRGB8888,
gbmFormat,
GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
}
return m_gbm_surface; // not owned, gets destroyed in QEglFSKmsGbmIntegration::destroyNativeWindow() via QEglFSKmsGbmWindow::invalidateSurface()

24
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp
View File

@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
@ -117,12 +117,30 @@ QRect QEglFSKmsScreen::rawGeometry() const
int QEglFSKmsScreen::depth() const
{
return 32;
return format() == QImage::Format_RGB16 ? 16 : 32;
}
QImage::Format QEglFSKmsScreen::format() const
{
return QImage::Format_RGB32;
// the result can be slightly incorrect, it won't matter in practice
switch (m_output.drm_format) {
case DRM_FORMAT_ARGB8888:
case DRM_FORMAT_ABGR8888:
return QImage::Format_ARGB32;
case DRM_FORMAT_RGB565:
case DRM_FORMAT_BGR565:
return QImage::Format_RGB16;
case DRM_FORMAT_XRGB2101010:
return QImage::Format_RGB30;
case DRM_FORMAT_XBGR2101010:
return QImage::Format_BGR30;
case DRM_FORMAT_ARGB2101010:
return QImage::Format_A2RGB30_Premultiplied;
case DRM_FORMAT_ABGR2101010:
return QImage::Format_A2BGR30_Premultiplied;
default:
return QImage::Format_RGB32;
}
}
QSizeF QEglFSKmsScreen::physicalSize() const