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

backends/drm: use addfb2modifier again when supported

Browse source 
Otherwise the kernel might fail our request because the modifier doesn't
match the buffer
This commit is contained in:
Xaver Hugl 2022-05-06 19:43:27 +02:00
parent 788ae5891a
commit 9ef882f3fb
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/backends/drm/drm_buffer.cpp
View file

@ -134,9 +134,18 @@ std::shared_ptr<DrmFramebuffer> DrmFramebuffer::createFramebuffer(const std::sha
const auto offsets = buffer->offsets();
uint32_t framebufferId = 0;
int ret = drmModeAddFB2(buffer->gpu()->fd(), size.width(), size.height(), buffer->format(), handles.data(), strides.data(), offsets.data(), &framebufferId, 0);
if (ret == EOPNOTSUPP && handles.size() == 1) {
ret = drmModeAddFB(buffer->gpu()->fd(), size.width(), size.height(), 24, 32, strides[0], handles[0], &framebufferId);
int ret;
if (buffer->gpu()->addFB2ModifiersSupported() && buffer->modifier() != DRM_FORMAT_MOD_INVALID) {
uint64_t modifier[4];
for (uint32_t i = 0; i < 4; i++) {
modifier[i] = i < buffer->planeCount() ? buffer->modifier() : 0;
}
ret = drmModeAddFB2WithModifiers(buffer->gpu()->fd(), size.width(), size.height(), buffer->format(), handles.data(), strides.data(), offsets.data(), modifier, &framebufferId, DRM_MODE_FB_MODIFIERS);
} else {
ret = drmModeAddFB2(buffer->gpu()->fd(), size.width(), size.height(), buffer->format(), handles.data(), strides.data(), offsets.data(), &framebufferId, 0);
if (ret == EOPNOTSUPP && handles.size() == 1) {
ret = drmModeAddFB(buffer->gpu()->fd(), size.width(), size.height(), 24, 32, strides[0], handles[0], &framebufferId);
}
}
if (ret == 0) {
return std::make_shared<DrmFramebuffer>(buffer, framebufferId);