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

backends/drm: add buffer format to logging

Browse source
This commit is contained in:
Xaver Hugl 2022-12-05 21:27:10 +01:00 committed by Vlad Zahorodnii
parent f1440ebca1
commit b3e977f416
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/backends/drm/drm_egl_layer_surface.cpp
View file

@ -34,6 +34,13 @@ namespace KWin
static const QVector<uint64_t> linearModifier = {DRM_FORMAT_MOD_LINEAR}; static const QVector<uint64_t> linearModifier = {DRM_FORMAT_MOD_LINEAR};
static gbm_format_name_desc formatName(uint32_t format)
{
gbm_format_name_desc ret;
gbm_format_get_name(format, &ret);
return ret;
}
EglGbmLayerSurface::EglGbmLayerSurface(DrmGpu *gpu, EglGbmBackend *eglBackend, BufferTarget target) EglGbmLayerSurface::EglGbmLayerSurface(DrmGpu *gpu, EglGbmBackend *eglBackend, BufferTarget target)
: m_gpu(gpu) : m_gpu(gpu)
, m_eglBackend(eglBackend) , m_eglBackend(eglBackend)
@ -349,7 +356,7 @@ std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::importBuffer(Surface &surfac
} else { } else {
const auto ret = DrmFramebuffer::createFramebuffer(sourceBuffer); const auto ret = DrmFramebuffer::createFramebuffer(sourceBuffer);
if (!ret) { if (!ret) {
qCWarning(KWIN_DRM, "Failed to create framebuffer: %s", strerror(errno)); qCWarning(KWIN_DRM, "Failed to create %s framebuffer: %s", formatName(sourceBuffer->format()).name, strerror(errno));
} }
return ret; return ret;
} }
@ -359,12 +366,12 @@ std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::importDmabuf(GbmBuffer *sour
{ {
const auto imported = GbmBuffer::importBuffer(m_gpu, sourceBuffer, sourceBuffer->flags() | GBM_BO_USE_SCANOUT); const auto imported = GbmBuffer::importBuffer(m_gpu, sourceBuffer, sourceBuffer->flags() | GBM_BO_USE_SCANOUT);
if (!imported) { if (!imported) {
qCWarning(KWIN_DRM, "failed to import gbm_bo for multi-gpu usage: %s", strerror(errno)); qCWarning(KWIN_DRM, "failed to import %s gbm_bo for multi-gpu usage: %s", formatName(sourceBuffer->format()).name, strerror(errno));
return nullptr; return nullptr;
} }
const auto ret = DrmFramebuffer::createFramebuffer(imported); const auto ret = DrmFramebuffer::createFramebuffer(imported);
if (!ret) { if (!ret) {
qCWarning(KWIN_DRM, "Failed to create framebuffer for multi-gpu: %s", strerror(errno)); qCWarning(KWIN_DRM, "Failed to create %s framebuffer for multi-gpu: %s", formatName(imported->format()).name, strerror(errno));
} }
return ret; return ret;
} }
@ -373,12 +380,13 @@ std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::importWithCpu(Surface &surfa
{ {
Q_ASSERT(surface.importSwapchain && !surface.importSwapchain->isEmpty()); Q_ASSERT(surface.importSwapchain && !surface.importSwapchain->isEmpty());
if (!sourceBuffer->map(GBM_BO_TRANSFER_READ)) { if (!sourceBuffer->map(GBM_BO_TRANSFER_READ)) {
qCWarning(KWIN_DRM, "mapping a gbm_bo failed: %s", strerror(errno)); qCWarning(KWIN_DRM, "mapping a %s gbm_bo failed: %s", formatName(sourceBuffer->format()).name, strerror(errno));
return nullptr; return nullptr;
} }
const auto importBuffer = surface.importSwapchain->acquireBuffer(); const auto importBuffer = surface.importSwapchain->acquireBuffer();
if (sourceBuffer->planeCount() != 1 || sourceBuffer->strides()[0] != importBuffer->strides()[0]) { if (sourceBuffer->planeCount() != 1 || sourceBuffer->strides()[0] != importBuffer->strides()[0]) {
qCCritical(KWIN_DRM, "stride of gbm_bo (%d) and dumb buffer (%d) don't match!", sourceBuffer->strides()[0], importBuffer->strides()[0]); qCCritical(KWIN_DRM, "stride of gbm_bo (%d) and dumb buffer (%d) with format %s don't match!",
sourceBuffer->strides()[0], importBuffer->strides()[0], formatName(sourceBuffer->format()).name);
return nullptr; return nullptr;
} }
if (!memcpy(importBuffer->data(), sourceBuffer->mappedData(), importBuffer->size().height() * importBuffer->strides()[0])) { if (!memcpy(importBuffer->data(), sourceBuffer->mappedData(), importBuffer->size().height() * importBuffer->strides()[0])) {
@ -386,7 +394,7 @@ std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::importWithCpu(Surface &surfa
} }
const auto ret = DrmFramebuffer::createFramebuffer(importBuffer); const auto ret = DrmFramebuffer::createFramebuffer(importBuffer);
if (!ret) { if (!ret) {
qCWarning(KWIN_DRM, "Failed to create framebuffer for CPU import: %s", strerror(errno)); qCWarning(KWIN_DRM, "Failed to create %s framebuffer for CPU import: %s", formatName(sourceBuffer->format()).name, strerror(errno));
} }
return ret; return ret;
} }