#include "helpers.h"
#include "util.h"
-int drv_bpp_from_format(uint32_t format, size_t plane)
+static uint32_t subsample_stride(uint32_t stride, uint32_t format, size_t plane)
+{
+
+ if (plane != 0) {
+ switch (format) {
+ case DRM_FORMAT_YVU420:
+ case DRM_FORMAT_YVU420_ANDROID:
+ stride = DIV_ROUND_UP(stride, 2);
+ break;
+ }
+ }
+
+ return stride;
+}
+
+static uint32_t bpp_from_format(uint32_t format, size_t plane)
{
assert(plane < drv_num_planes_from_format(format));
case DRM_FORMAT_YVU420_ANDROID:
return 8;
- /*
- * NV12 is laid out as follows. Each letter represents a byte.
- * Y plane:
- * Y0_0, Y0_1, Y0_2, Y0_3, ..., Y0_N
- * Y1_0, Y1_1, Y1_2, Y1_3, ..., Y1_N
- * ...
- * YM_0, YM_1, YM_2, YM_3, ..., YM_N
- * CbCr plane:
- * Cb01_01, Cr01_01, Cb01_23, Cr01_23, ..., Cb01_(N-1)N, Cr01_(N-1)N
- * Cb23_01, Cr23_01, Cb23_23, Cr23_23, ..., Cb23_(N-1)N, Cr23_(N-1)N
- * ...
- * Cb(M-1)M_01, Cr(M-1)M_01, ..., Cb(M-1)M_(N-1)N, Cr(M-1)M_(N-1)N
- *
- * Pixel (0, 0) requires Y0_0, Cb01_01 and Cr01_01. Pixel (0, 1) requires
- * Y0_1, Cb01_01 and Cr01_01. So for a single pixel, 2 bytes of luma data
- * are required.
- */
case DRM_FORMAT_NV12:
- return (plane == 0) ? 8 : 16;
+ case DRM_FORMAT_NV21:
+ return (plane == 0) ? 8 : 4;
case DRM_FORMAT_ABGR1555:
case DRM_FORMAT_ABGR4444:
return 0;
}
+uint32_t drv_bo_get_stride_in_pixels(struct bo *bo)
+{
+ uint32_t bytes_per_pixel = DIV_ROUND_UP(bpp_from_format(bo->format, 0), 8);
+ return DIV_ROUND_UP(bo->strides[0], bytes_per_pixel);
+}
+
/*
- * This function fills in the buffer object given driver aligned dimensions
- * (in pixels) and a format. This function assumes there is just one kernel
- * buffer per buffer object.
+ * This function returns the stride for a given format, width and plane.
*/
-int drv_bo_from_format(struct bo *bo, uint32_t aligned_width,
- uint32_t aligned_height, uint32_t format)
+uint32_t drv_stride_from_format(uint32_t format, uint32_t width, size_t plane)
+{
+ uint32_t stride = DIV_ROUND_UP(width * bpp_from_format(format, plane), 8);
+
+ /*
+ * The stride of Android YV12 buffers is required to be aligned to 16 bytes
+ * (see <system/graphics.h>).
+ */
+ if (format == DRM_FORMAT_YVU420_ANDROID)
+ stride = (plane == 0) ? ALIGN(stride, 32) : ALIGN(stride, 16);
+
+ return stride;
+}
+
+/*
+ * This function fills in the buffer object given the driver aligned stride of
+ * the first plane, height and a format. This function assumes there is just
+ * one kernel buffer per buffer object.
+ */
+int drv_bo_from_format(struct bo *bo, uint32_t stride, uint32_t aligned_height, uint32_t format)
{
size_t p, num_planes;
num_planes = drv_num_planes_from_format(format);
assert(num_planes);
- bo->total_size = 0;
+
+ /*
+ * HAL_PIXEL_FORMAT_YV12 requires that (see <system/graphics.h>):
+ * - the aligned height is same as the buffer's height.
+ * - the chroma stride is 16 bytes aligned, i.e., the luma's strides
+ * is 32 bytes aligned.
+ */
+ if (format == DRM_FORMAT_YVU420_ANDROID) {
+ assert(aligned_height == bo->height);
+ assert(stride == ALIGN(stride, 32));
+ }
for (p = 0; p < num_planes; p++) {
- bo->strides[p] = drv_stride_from_format(format, aligned_width,
- p);
- bo->sizes[p] = drv_size_from_format(format, bo->strides[p],
- bo->height, p);
+ bo->strides[p] = subsample_stride(stride, format, p);
+ bo->sizes[p] = drv_size_from_format(format, bo->strides[p], aligned_height, p);
bo->offsets[p] = offset;
offset += bo->sizes[p];
- bo->total_size += drv_size_from_format(format, bo->strides[p],
- aligned_height, p);
}
+ bo->total_size = offset;
return 0;
}
-int drv_dumb_bo_create(struct bo *bo, uint32_t width, uint32_t height,
- uint32_t format, uint32_t flags)
+int drv_dumb_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+ uint32_t flags)
{
- struct drm_mode_create_dumb create_dumb;
int ret;
+ size_t plane;
+ uint32_t aligned_width, aligned_height;
+ struct drm_mode_create_dumb create_dumb;
- /* Only single-plane formats are supported */
- assert(drv_num_planes_from_format(format) == 1);
+ aligned_width = width;
+ aligned_height = height;
+ if (format == DRM_FORMAT_YVU420_ANDROID) {
+ /*
+ * Align width to 32 pixels, so chroma strides are 16 bytes as
+ * Android requires.
+ */
+ aligned_width = ALIGN(width, 32);
+ }
+
+ if (format == DRM_FORMAT_YVU420_ANDROID || format == DRM_FORMAT_YVU420) {
+ aligned_height = 3 * DIV_ROUND_UP(height, 2);
+ }
memset(&create_dumb, 0, sizeof(create_dumb));
- create_dumb.height = height;
- create_dumb.width = width;
- create_dumb.bpp = drv_bpp_from_format(format, 0);
+ create_dumb.height = aligned_height;
+ create_dumb.width = aligned_width;
+ create_dumb.bpp = bpp_from_format(format, 0);
create_dumb.flags = 0;
ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_dumb);
return ret;
}
- bo->width = width;
- bo->height = height;
- bo->handles[0].u32 = create_dumb.handle;
- bo->offsets[0] = 0;
- bo->total_size = bo->sizes[0] = create_dumb.size;
- bo->strides[0] = create_dumb.pitch;
+ drv_bo_from_format(bo, create_dumb.pitch, height, format);
+
+ for (plane = 0; plane < bo->num_planes; plane++)
+ bo->handles[plane].u32 = create_dumb.handle;
+ bo->total_size = create_dumb.size;
return 0;
}
ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy_dumb);
if (ret) {
- fprintf(stderr, "drv: DRM_IOCTL_MODE_DESTROY_DUMB failed "
- "(handle=%x)\n", bo->handles[0].u32);
+ fprintf(stderr, "drv: DRM_IOCTL_MODE_DESTROY_DUMB failed (handle=%x)\n",
+ bo->handles[0].u32);
return ret;
}
ret = drmIoctl(bo->drv->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
if (ret) {
- fprintf(stderr, "drv: DRM_IOCTL_GEM_CLOSE failed "
- "(handle=%x) error %d\n",
- bo->handles[plane].u32, ret);
+ fprintf(stderr, "drv: DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n",
+ bo->handles[plane].u32, ret);
error = ret;
}
}
memset(&prime_handle, 0, sizeof(prime_handle));
prime_handle.fd = data->fds[plane];
- ret = drmIoctl(bo->drv->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE,
- &prime_handle);
+ ret = drmIoctl(bo->drv->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &prime_handle);
if (ret) {
- fprintf(stderr, "drv: DRM_IOCTL_PRIME_FD_TO_HANDLE "
- "failed (fd=%u)\n", prime_handle.fd);
+ fprintf(stderr, "drv: DRM_IOCTL_PRIME_FD_TO_HANDLE failed (fd=%u)\n",
+ prime_handle.fd);
/*
* Need to call GEM close on planes that were opened,
return 0;
}
-void *drv_dumb_bo_map(struct bo *bo, struct map_info *data, size_t plane)
+void *drv_dumb_bo_map(struct bo *bo, struct map_info *data, size_t plane, int prot)
{
int ret;
size_t i;
if (bo->handles[i].u32 == bo->handles[plane].u32)
data->length += bo->sizes[i];
- return mmap(0, data->length, PROT_READ | PROT_WRITE, MAP_SHARED,
- bo->drv->fd, map_dumb.offset);
+ return mmap(0, data->length, prot, MAP_SHARED, bo->drv->fd, map_dumb.offset);
}
-uintptr_t drv_get_reference_count(struct driver *drv, struct bo *bo,
- size_t plane)
+uintptr_t drv_get_reference_count(struct driver *drv, struct bo *bo, size_t plane)
{
void *count;
uintptr_t num = 0;
if (!drmHashLookup(drv->buffer_table, bo->handles[plane].u32, &count))
- num = (uintptr_t) (count);
+ num = (uintptr_t)(count);
return num;
}
-void drv_increment_reference_count(struct driver *drv, struct bo *bo,
- size_t plane)
+void drv_increment_reference_count(struct driver *drv, struct bo *bo, size_t plane)
{
uintptr_t num = drv_get_reference_count(drv, bo, plane);
/* If a value isn't in the table, drmHashDelete is a no-op */
drmHashDelete(drv->buffer_table, bo->handles[plane].u32);
- drmHashInsert(drv->buffer_table, bo->handles[plane].u32,
- (void *) (num + 1));
+ drmHashInsert(drv->buffer_table, bo->handles[plane].u32, (void *)(num + 1));
}
-void drv_decrement_reference_count(struct driver *drv, struct bo *bo,
- size_t plane)
+void drv_decrement_reference_count(struct driver *drv, struct bo *bo, size_t plane)
{
uintptr_t num = drv_get_reference_count(drv, bo, plane);
drmHashDelete(drv->buffer_table, bo->handles[plane].u32);
if (num > 0)
- drmHashInsert(drv->buffer_table, bo->handles[plane].u32,
- (void *) (num - 1));
+ drmHashInsert(drv->buffer_table, bo->handles[plane].u32, (void *)(num - 1));
}
uint32_t drv_log_base2(uint32_t value)
return ret;
}
-int drv_add_combination(struct driver *drv, uint32_t format,
- struct format_metadata *metadata, uint64_t usage)
+int drv_add_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,
+ uint64_t usage)
{
struct combinations *combos = &drv->backend->combos;
if (combos->size >= combos->allocations) {
struct combination *new_data;
combos->allocations *= 2;
- new_data = realloc(combos->data, combos->allocations
- * sizeof(*combos->data));
+ new_data = realloc(combos->data, combos->allocations * sizeof(*combos->data));
if (!new_data)
return -ENOMEM;
return 0;
}
-int drv_add_combinations(struct driver *drv, const uint32_t *formats,
- uint32_t num_formats, struct format_metadata *metadata,
- uint64_t usage)
+int drv_add_combinations(struct driver *drv, const uint32_t *formats, uint32_t num_formats,
+ struct format_metadata *metadata, uint64_t usage)
{
int ret;
uint32_t i;
return 0;
}
-void drv_modify_combination(struct driver *drv, uint32_t format,
- struct format_metadata *metadata, uint64_t usage)
+void drv_modify_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,
+ uint64_t usage)
{
uint32_t i;
struct combination *combo;
/* Attempts to add the specified usage to an existing combination. */
for (i = 0; i < drv->backend->combos.size; i++) {
combo = &drv->backend->combos.data[i];
- if (combo->format == format &&
- combo->metadata.tiling == metadata->tiling &&
+ if (combo->format == format && combo->metadata.tiling == metadata->tiling &&
combo->metadata.modifier == metadata->modifier)
combo->usage |= usage;
}
if (!plane)
goto out;
- props = drmModeObjectGetProperties(drv->fd, plane->plane_id,
- DRM_MODE_OBJECT_PLANE);
+ props = drmModeObjectGetProperties(drv->fd, plane->plane_id, DRM_MODE_OBJECT_PLANE);
if (!props)
goto out;
if (!found && item_size >= allocations) {
struct kms_item *new_data = NULL;
allocations *= 2;
- new_data = realloc(items, allocations *
- sizeof(*items));
+ new_data = realloc(items, allocations * sizeof(*items));
if (!new_data) {
item_size = 0;
goto out;
drmModeFreeObjectProperties(props);
drmModeFreePlane(plane);
-
}
drmModeFreePlaneResources(resources);
return items;
}
-int drv_add_linear_combinations(struct driver *drv, const uint32_t *formats,
- uint32_t num_formats)
+int drv_modify_linear_combinations(struct driver *drv)
{
- int ret;
uint32_t i, j, num_items;
struct kms_item *items;
struct combination *combo;
- struct format_metadata metadata;
- metadata.tiling = 0;
- metadata.priority = 1;
- metadata.modifier = DRM_FORMAT_MOD_NONE;
-
- ret = drv_add_combinations(drv, formats, num_formats, &metadata,
- BO_COMMON_USE_MASK);
- if (ret)
- return ret;
/*
* All current drivers can scanout linear XRGB8888/ARGB8888 as a primary
* plane and as a cursor. Some drivers don't support
* kernel disregards the alpha component of ARGB unless it's an overlay
* plane.
*/
- drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata,
+ drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &LINEAR_METADATA,
BO_USE_CURSOR | BO_USE_SCANOUT);
- drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata,
+ drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &LINEAR_METADATA,
BO_USE_CURSOR | BO_USE_SCANOUT);
items = drv_query_kms(drv, &num_items);
combo = &drv->backend->combos.data[j];
if (items[i].format == combo->format)
combo->usage |= BO_USE_SCANOUT;
-
-
}
}
OSDN Git Service
