brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renderer/native: Use drmModeAddFB2 where available

Browse Source 
drmModeAddFB2 allows specifying multiple planes, as well as directly
specifying the format, rather than relying on a depth/bpp -> format
mapping.

https://bugzilla.gnome.org/show_bug.cgi?id=785779
This commit is contained in:
Daniel Stone 2017-08-03 14:49:45 +01:00 committed by Jonas Ådahl
parent d670a1aa78
commit d99cd279d2
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/backends/native/meta-renderer-native.c
View File

@ -46,6 +46,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <drm_fourcc.h>
#include "backends/meta-backend-private.h" #include "backends/meta-backend-private.h"
#include "backends/meta-crtc.h" #include "backends/meta-crtc.h"
@ -1276,32 +1277,45 @@ gbm_get_next_fb_id (MetaGpuKms *gpu_kms,
struct gbm_bo **out_next_bo, struct gbm_bo **out_next_bo,
uint32_t *out_next_fb_id) uint32_t *out_next_fb_id)
{ {
uint32_t handle, stride;
struct gbm_bo *next_bo; struct gbm_bo *next_bo;
uint32_t next_fb_id; uint32_t next_fb_id;
int kms_fd; int kms_fd;
uint32_t handles[4] = { 0, };
uint32_t strides[4] = { 0, };
uint32_t offsets[4] = { 0, };
/* Now we need to set the CRTC to whatever is the front buffer */ /* Now we need to set the CRTC to whatever is the front buffer */
next_bo = gbm_surface_lock_front_buffer (gbm_surface); next_bo = gbm_surface_lock_front_buffer (gbm_surface);
stride = gbm_bo_get_stride (next_bo); strides[0] = gbm_bo_get_stride (next_bo);
handle = gbm_bo_get_handle (next_bo).u32; handles[0] = gbm_bo_get_handle (next_bo).u32;
kms_fd = meta_gpu_kms_get_fd (gpu_kms); kms_fd = meta_gpu_kms_get_fd (gpu_kms);
if (drmModeAddFB2 (kms_fd,
gbm_bo_get_width (next_bo),
gbm_bo_get_height (next_bo),
gbm_bo_get_format (next_bo),
handles,
strides,
offsets,
&next_fb_id,
0))
{
if (drmModeAddFB (kms_fd, if (drmModeAddFB (kms_fd,
gbm_bo_get_width (next_bo), gbm_bo_get_width (next_bo),
gbm_bo_get_height (next_bo), gbm_bo_get_height (next_bo),
24, /* depth */ 24, /* depth */
32, /* bpp */ 32, /* bpp */
stride, strides[0],
handle, handles[0],
&next_fb_id)) &next_fb_id))
{ {
g_warning ("Failed to create new back buffer handle: %m"); g_warning ("Failed to create new back buffer handle: %m");
gbm_surface_release_buffer (gbm_surface, next_bo); gbm_surface_release_buffer (gbm_surface, next_bo);
return FALSE; return FALSE;
} }
}
*out_next_bo = next_bo; *out_next_bo = next_bo;
*out_next_fb_id = next_fb_id; *out_next_fb_id = next_fb_id;