mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: add num_planes to drm_fb structure

Browse Source 
Add new member to store number of planes to drm_fb structure.

Signed-off-by: Tomohito Esaki <etom@igel.co.jp>
This commit is contained in:
Tomohito Esaki
2018-09-10 11:44:17 +09:00
parent da4f185faa
commit 4976b09a7e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+6 -1
View File
@@ -369,6 +369,7 @@ struct drm_fb {
uint32_t handles[4]; uint32_t handles[4];
uint32_t strides[4]; uint32_t strides[4];
uint32_t offsets[4]; uint32_t offsets[4];
int num_planes;
const struct pixel_format_info *format; const struct pixel_format_info *format;
uint64_t modifier; uint64_t modifier;
int width, height; int width, height;
@@ -1033,6 +1034,7 @@ drm_fb_create_dumb(struct drm_backend *b, int width, int height,
fb->modifier = DRM_FORMAT_MOD_INVALID; fb->modifier = DRM_FORMAT_MOD_INVALID;
fb->handles[0] = create_arg.handle; fb->handles[0] = create_arg.handle;
fb->strides[0] = create_arg.pitch; fb->strides[0] = create_arg.pitch;
fb->num_planes = 1;
fb->size = create_arg.size; fb->size = create_arg.size;
fb->width = width; fb->width = width;
fb->height = height; fb->height = height;
@@ -1204,6 +1206,7 @@ drm_fb_get_from_dmabuf(struct linux_dmabuf_buffer *dmabuf,
goto err_free; goto err_free;
} }
fb->num_planes = dmabuf->attributes.n_planes;
for (i = 0; i < dmabuf->attributes.n_planes; i++) { for (i = 0; i < dmabuf->attributes.n_planes; i++) {
fb->handles[i] = gbm_bo_get_handle_for_plane(fb->bo, i).u32; fb->handles[i] = gbm_bo_get_handle_for_plane(fb->bo, i).u32;
if (!fb->handles[i]) if (!fb->handles[i])
@@ -1251,12 +1254,14 @@ drm_fb_get_from_bo(struct gbm_bo *bo, struct drm_backend *backend,
#ifdef HAVE_GBM_MODIFIERS #ifdef HAVE_GBM_MODIFIERS
fb->modifier = gbm_bo_get_modifier(bo); fb->modifier = gbm_bo_get_modifier(bo);
for (i = 0; i < gbm_bo_get_plane_count(bo); i++) { fb->num_planes = gbm_bo_get_plane_count(bo);
for (i = 0; i < fb->num_planes; i++) {
fb->strides[i] = gbm_bo_get_stride_for_plane(bo, i); fb->strides[i] = gbm_bo_get_stride_for_plane(bo, i);
fb->handles[i] = gbm_bo_get_handle_for_plane(bo, i).u32; fb->handles[i] = gbm_bo_get_handle_for_plane(bo, i).u32;
fb->offsets[i] = gbm_bo_get_offset(bo, i); fb->offsets[i] = gbm_bo_get_offset(bo, i);
} }
#else #else
fb->num_planes = 1;
fb->strides[0] = gbm_bo_get_stride(bo); fb->strides[0] = gbm_bo_get_stride(bo);
fb->handles[0] = gbm_bo_get_handle(bo).u32; fb->handles[0] = gbm_bo_get_handle(bo).u32;
fb->modifier = DRM_FORMAT_MOD_INVALID; fb->modifier = DRM_FORMAT_MOD_INVALID;