/*
- * Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+ * Copyright 2014 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
gbm_device_is_format_supported(struct gbm_device *gbm,
uint32_t format, uint32_t usage)
{
- uint32_t drv_format;
uint64_t drv_usage;
if (usage & GBM_BO_USE_CURSOR &&
usage & GBM_BO_USE_RENDERING)
return 0;
- drv_format = gbm_convert_format(format);
drv_usage = gbm_convert_flags(usage);
- return drv_is_format_supported(gbm->drv, drv_format, drv_usage);
+ return drv_is_combination_supported(gbm->drv, format, drv_usage,
+ DRM_FORMAT_MOD_NONE);
}
PUBLIC struct gbm_device *gbm_create_device(int fd)
if (!bo)
return NULL;
- bo->bo = drv_bo_create(gbm->drv, width, height,
- gbm_convert_format(format),
+ bo->bo = drv_bo_create(gbm->drv, width, height, format,
gbm_convert_flags(flags));
if (!bo->bo) {
struct gbm_import_fd_data *fd_data = buffer;
struct gbm_import_fd_planar_data *fd_planar_data = buffer;
uint32_t gbm_format;
- int i;
+ size_t num_planes, i;
memset(&drv_data, 0, sizeof(drv_data));
gbm_format = fd_data->format;
drv_data.width = fd_data->width;
drv_data.height = fd_data->height;
- drv_data.format = gbm_convert_format(fd_data->format);
+ 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;
gbm_format = fd_planar_data->format;
drv_data.width = fd_planar_data->width;
drv_data.height = fd_planar_data->height;
- drv_data.format = gbm_convert_format(fd_planar_data->format);
- for (i = 0; i < GBM_MAX_PLANES; i++) {
+ drv_data.format = fd_planar_data->format;
+ num_planes = drv_num_planes_from_format(drv_data.format);
+
+ 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.sizes[i] = fd_planar_data->height *
- fd_planar_data->strides[i];
drv_data.format_modifiers[i] =
fd_planar_data->format_modifiers[i];
+
+ drv_data.sizes[i] = drv_size_from_format(
+ drv_data.format,
+ drv_data.strides[i],
+ drv_data.height,
+ i);
}
+
+ for (i = num_planes; i < GBM_MAX_PLANES; i++)
+ drv_data.fds[i] = -1;
+
break;
default:
return NULL;