X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=gbm.c;h=a6ccaaa3372da20bdfa974164fc93bc9cac30b0a;hb=310cf97a929fced825454e03e0a9390a204dc2d8;hp=ab576cf926d428f6116960d8ff8349451b5ab256;hpb=1b1d56ae4018eaed1da9d6e7032554156b7be020;p=android-x86%2Fexternal-minigbm.git diff --git a/gbm.c b/gbm.c index ab576cf..a6ccaaa 100644 --- a/gbm.c +++ b/gbm.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "drv.h" @@ -30,14 +31,20 @@ PUBLIC const char *gbm_device_get_backend_name(struct gbm_device *gbm) PUBLIC int gbm_device_is_format_supported(struct gbm_device *gbm, uint32_t format, uint32_t usage) { - uint64_t drv_usage; + uint64_t use_flags; if (usage & GBM_BO_USE_CURSOR && usage & GBM_BO_USE_RENDERING) return 0; - drv_usage = gbm_convert_flags(usage); + use_flags = gbm_convert_usage(usage); - return (drv_get_combination(gbm->drv, format, drv_usage) != NULL); + return (drv_get_combination(gbm->drv, format, use_flags) != NULL); +} + +PUBLIC int gbm_device_get_format_modifier_plane_count(struct gbm_device *gbm, uint32_t format, + uint64_t modifier) +{ + return 0; } PUBLIC struct gbm_device *gbm_create_device(int fd) @@ -65,7 +72,7 @@ PUBLIC void gbm_device_destroy(struct gbm_device *gbm) } PUBLIC struct gbm_surface *gbm_surface_create(struct gbm_device *gbm, uint32_t width, - uint32_t height, uint32_t format, uint32_t flags) + uint32_t height, uint32_t format, uint32_t usage) { struct gbm_surface *surface = (struct gbm_surface *)malloc(sizeof(*surface)); @@ -75,9 +82,15 @@ PUBLIC struct gbm_surface *gbm_surface_create(struct gbm_device *gbm, uint32_t w return surface; } -PUBLIC void gbm_surface_destroy(struct gbm_surface *surface) +PUBLIC struct gbm_surface *gbm_surface_create_with_modifiers(struct gbm_device *gbm, uint32_t width, + uint32_t height, uint32_t format, + const uint64_t *modifiers, + const unsigned int count) { - free(surface); + if (count != 0 || modifiers != NULL) + return NULL; + + return gbm_surface_create(gbm, width, height, format, 0); } PUBLIC struct gbm_bo *gbm_surface_lock_front_buffer(struct gbm_surface *surface) @@ -89,6 +102,16 @@ PUBLIC void gbm_surface_release_buffer(struct gbm_surface *surface, struct gbm_b { } +PUBLIC int gbm_surface_has_free_buffers(struct gbm_surface *surface) +{ + return 0; +} + +PUBLIC void gbm_surface_destroy(struct gbm_surface *surface) +{ + free(surface); +} + static struct gbm_bo *gbm_bo_new(struct gbm_device *gbm, uint32_t format) { struct gbm_bo *bo; @@ -104,11 +127,11 @@ static struct gbm_bo *gbm_bo_new(struct gbm_device *gbm, uint32_t format) } PUBLIC struct gbm_bo *gbm_bo_create(struct gbm_device *gbm, uint32_t width, uint32_t height, - uint32_t format, uint32_t flags) + uint32_t format, uint32_t usage) { struct gbm_bo *bo; - if (!gbm_device_is_format_supported(gbm, format, flags)) + if (!gbm_device_is_format_supported(gbm, format, usage)) return NULL; bo = gbm_bo_new(gbm, format); @@ -116,7 +139,15 @@ PUBLIC struct gbm_bo *gbm_bo_create(struct gbm_device *gbm, uint32_t width, uint if (!bo) return NULL; - bo->bo = drv_bo_create(gbm->drv, width, height, format, gbm_convert_flags(flags)); + /* + * HACK: This is for HAL_PIXEL_FORMAT_YV12 buffers allocated by arcvm. + * None of our platforms can display YV12, so we can treat as a SW buffer. + * Remove once this can be intelligently resolved in the guest. + */ + if (format == GBM_FORMAT_YVU420 && (usage & GBM_BO_USE_LINEAR)) + format = DRM_FORMAT_YVU420_ANDROID; + + bo->bo = drv_bo_create(gbm->drv, width, height, format, gbm_convert_usage(usage)); if (!bo->bo) { free(bo); @@ -165,12 +196,12 @@ PUBLIC struct gbm_bo *gbm_bo_import(struct gbm_device *gbm, uint32_t type, void struct gbm_bo *bo; struct drv_import_fd_data drv_data; struct gbm_import_fd_data *fd_data = buffer; - struct gbm_import_fd_planar_data *fd_planar_data = buffer; + struct gbm_import_fd_modifier_data *fd_modifier_data = buffer; uint32_t gbm_format; - size_t num_planes, i; + size_t num_planes, i, num_fds; memset(&drv_data, 0, sizeof(drv_data)); - + drv_data.use_flags = gbm_convert_usage(usage); switch (type) { case GBM_BO_IMPORT_FD: gbm_format = fd_data->format; @@ -179,25 +210,31 @@ PUBLIC struct gbm_bo *gbm_bo_import(struct gbm_device *gbm, uint32_t type, void drv_data.format = fd_data->format; drv_data.fds[0] = fd_data->fd; drv_data.strides[0] = fd_data->stride; - drv_data.sizes[0] = fd_data->height * fd_data->stride; - break; - case GBM_BO_IMPORT_FD_PLANAR: - gbm_format = fd_planar_data->format; - drv_data.width = fd_planar_data->width; - drv_data.height = fd_planar_data->height; - drv_data.format = fd_planar_data->format; - num_planes = drv_num_planes_from_format(drv_data.format); + for (i = 0; i < GBM_MAX_PLANES; ++i) + drv_data.format_modifiers[i] = DRM_FORMAT_MOD_INVALID; + break; + case GBM_BO_IMPORT_FD_MODIFIER: + gbm_format = fd_modifier_data->format; + drv_data.width = fd_modifier_data->width; + drv_data.height = fd_modifier_data->height; + drv_data.format = fd_modifier_data->format; + num_planes = drv_num_planes_from_modifier(gbm->drv, drv_data.format, + fd_modifier_data->modifier); assert(num_planes); - for (i = 0; i < num_planes; i++) { - drv_data.fds[i] = fd_planar_data->fds[i]; - drv_data.offsets[i] = fd_planar_data->offsets[i]; - drv_data.strides[i] = fd_planar_data->strides[i]; - drv_data.format_modifiers[i] = fd_planar_data->format_modifiers[i]; + num_fds = fd_modifier_data->num_fds; + if (!num_fds || num_fds > num_planes) + return NULL; - drv_data.sizes[i] = drv_size_from_format( - drv_data.format, drv_data.strides[i], drv_data.height, i); + for (i = 0; i < num_planes; i++) { + if (num_fds != num_planes) + drv_data.fds[i] = fd_modifier_data->fds[0]; + else + drv_data.fds[i] = fd_modifier_data->fds[i]; + drv_data.offsets[i] = fd_modifier_data->offsets[i]; + drv_data.strides[i] = fd_modifier_data->strides[i]; + drv_data.format_modifiers[i] = fd_modifier_data->modifier; } for (i = num_planes; i < GBM_MAX_PLANES; i++) @@ -227,19 +264,15 @@ PUBLIC struct gbm_bo *gbm_bo_import(struct gbm_device *gbm, uint32_t type, void } PUBLIC void *gbm_bo_map(struct gbm_bo *bo, uint32_t x, uint32_t y, uint32_t width, uint32_t height, - uint32_t flags, uint32_t *stride, void **map_data, size_t plane) + uint32_t transfer_flags, uint32_t *stride, void **map_data) { - if (!bo || width == 0 || height == 0 || !stride || !map_data) - return NULL; - - *stride = gbm_bo_get_plane_stride(bo, plane); - return drv_bo_map(bo->bo, x, y, width, height, 0, (struct map_info **)map_data, plane); + return gbm_bo_map2(bo, x, y, width, height, transfer_flags, stride, map_data, 0); } PUBLIC void gbm_bo_unmap(struct gbm_bo *bo, void *map_data) { assert(bo); - drv_bo_unmap(bo->bo, map_data); + drv_bo_flush_or_unmap(bo->bo, map_data); } PUBLIC uint32_t gbm_bo_get_width(struct gbm_bo *bo) @@ -254,22 +287,22 @@ PUBLIC uint32_t gbm_bo_get_height(struct gbm_bo *bo) PUBLIC uint32_t gbm_bo_get_stride(struct gbm_bo *bo) { - return gbm_bo_get_plane_stride(bo, 0); + return gbm_bo_get_stride_for_plane(bo, 0); } -PUBLIC uint32_t gbm_bo_get_stride_or_tiling(struct gbm_bo *bo) +PUBLIC uint32_t gbm_bo_get_format(struct gbm_bo *bo) { - return drv_bo_get_stride_or_tiling(bo->bo); + return bo->gbm_format; } -PUBLIC uint32_t gbm_bo_get_format(struct gbm_bo *bo) +PUBLIC uint32_t gbm_bo_get_bpp(struct gbm_bo *bo) { - return bo->gbm_format; + return drv_bytes_per_pixel_from_format(drv_bo_get_format(bo->bo), 0); } -PUBLIC uint64_t gbm_bo_get_format_modifier(struct gbm_bo *bo) +PUBLIC uint64_t gbm_bo_get_modifier(struct gbm_bo *bo) { - return gbm_bo_get_plane_format_modifier(bo, 0); + return drv_bo_get_plane_format_modifier(bo->bo, 0); } PUBLIC struct gbm_device *gbm_bo_get_device(struct gbm_bo *bo) @@ -279,7 +312,7 @@ PUBLIC struct gbm_device *gbm_bo_get_device(struct gbm_bo *bo) PUBLIC union gbm_bo_handle gbm_bo_get_handle(struct gbm_bo *bo) { - return gbm_bo_get_plane_handle(bo, 0); + return gbm_bo_get_handle_for_plane(bo, 0); } PUBLIC int gbm_bo_get_fd(struct gbm_bo *bo) @@ -287,49 +320,106 @@ PUBLIC int gbm_bo_get_fd(struct gbm_bo *bo) return gbm_bo_get_plane_fd(bo, 0); } -PUBLIC size_t gbm_bo_get_num_planes(struct gbm_bo *bo) +PUBLIC int gbm_bo_get_plane_count(struct gbm_bo *bo) { return drv_bo_get_num_planes(bo->bo); } -PUBLIC union gbm_bo_handle gbm_bo_get_plane_handle(struct gbm_bo *bo, size_t plane) +PUBLIC union gbm_bo_handle gbm_bo_get_handle_for_plane(struct gbm_bo *bo, size_t plane) { - return (union gbm_bo_handle)drv_bo_get_plane_handle(bo->bo, plane).u64; + return (union gbm_bo_handle)drv_bo_get_plane_handle(bo->bo, (size_t)plane).u64; } -PUBLIC int gbm_bo_get_plane_fd(struct gbm_bo *bo, size_t plane) +PUBLIC uint32_t gbm_bo_get_offset(struct gbm_bo *bo, size_t plane) { - return drv_bo_get_plane_fd(bo->bo, plane); + return drv_bo_get_plane_offset(bo->bo, (size_t)plane); } -PUBLIC uint32_t gbm_bo_get_plane_offset(struct gbm_bo *bo, size_t plane) +PUBLIC uint32_t gbm_bo_get_stride_for_plane(struct gbm_bo *bo, size_t plane) { - return drv_bo_get_plane_offset(bo->bo, plane); + return drv_bo_get_plane_stride(bo->bo, (size_t)plane); } -PUBLIC uint32_t gbm_bo_get_plane_size(struct gbm_bo *bo, size_t plane) +PUBLIC void gbm_bo_set_user_data(struct gbm_bo *bo, void *data, + void (*destroy_user_data)(struct gbm_bo *, void *)) { - return drv_bo_get_plane_size(bo->bo, plane); + bo->user_data = data; + bo->destroy_user_data = destroy_user_data; } -PUBLIC uint32_t gbm_bo_get_plane_stride(struct gbm_bo *bo, size_t plane) +PUBLIC void *gbm_bo_get_user_data(struct gbm_bo *bo) { - return drv_bo_get_plane_stride(bo->bo, plane); + return bo->user_data; } -PUBLIC uint64_t gbm_bo_get_plane_format_modifier(struct gbm_bo *bo, size_t plane) +/* The two GBM_BO_FORMAT_[XA]RGB8888 formats alias the GBM_FORMAT_* + * formats of the same name. We want to accept them whenever someone + * has a GBM format, but never return them to the user. + */ +static uint32_t gbm_format_canonicalize(uint32_t gbm_format) { - return drv_bo_get_plane_format_modifier(bo->bo, plane); + switch (gbm_format) { + case GBM_BO_FORMAT_XRGB8888: + return GBM_FORMAT_XRGB8888; + case GBM_BO_FORMAT_ARGB8888: + return GBM_FORMAT_ARGB8888; + default: + return gbm_format; + } } -PUBLIC void gbm_bo_set_user_data(struct gbm_bo *bo, void *data, - void (*destroy_user_data)(struct gbm_bo *, void *)) +/** + * Returns a string representing the fourcc format name. + */ +PUBLIC char *gbm_format_get_name(uint32_t gbm_format, struct gbm_format_name_desc *desc) { - bo->user_data = data; - bo->destroy_user_data = destroy_user_data; + gbm_format = gbm_format_canonicalize(gbm_format); + + desc->name[0] = gbm_format; + desc->name[1] = gbm_format >> 8; + desc->name[2] = gbm_format >> 16; + desc->name[3] = gbm_format >> 24; + desc->name[4] = 0; + + return desc->name; } -PUBLIC void *gbm_bo_get_user_data(struct gbm_bo *bo) +/* + * The following functions are not deprecated, but not in the Mesa the gbm + * header. The main difference is minigbm allows for the possibility of + * disjoint YUV images, while Mesa GBM does not. + */ +PUBLIC uint32_t gbm_bo_get_plane_size(struct gbm_bo *bo, size_t plane) { - return bo->user_data; + return drv_bo_get_plane_size(bo->bo, plane); +} + +PUBLIC int gbm_bo_get_plane_fd(struct gbm_bo *bo, size_t plane) +{ + return drv_bo_get_plane_fd(bo->bo, plane); +} + +PUBLIC void *gbm_bo_map2(struct gbm_bo *bo, uint32_t x, uint32_t y, uint32_t width, uint32_t height, + uint32_t transfer_flags, uint32_t *stride, void **map_data, int plane) +{ + void *addr; + off_t offset; + uint32_t map_flags; + plane = (size_t)plane; + struct rectangle rect = { .x = x, .y = y, .width = width, .height = height }; + if (!bo || width == 0 || height == 0 || !stride || !map_data) + return NULL; + + map_flags = (transfer_flags & GBM_BO_TRANSFER_READ) ? BO_MAP_READ : BO_MAP_NONE; + map_flags |= (transfer_flags & GBM_BO_TRANSFER_WRITE) ? BO_MAP_WRITE : BO_MAP_NONE; + + addr = drv_bo_map(bo->bo, &rect, map_flags, (struct mapping **)map_data, plane); + if (addr == MAP_FAILED) + return MAP_FAILED; + + *stride = ((struct mapping *)*map_data)->vma->map_strides[plane]; + + offset = *stride * rect.y; + offset += rect.x * drv_bytes_per_pixel_from_format(bo->gbm_format, plane); + return (void *)((uint8_t *)addr + offset); }