minigbm: Refactored minigbm on top a private API
We would like to reuse the same set of drivers for ChromeOS (with
a minigbm frontend) and Android (with a gralloc frontend). Since
we don't want to pollute the gbm API with gralloc formats and usages,
we can refactor minigbm on top a private API that will be a superset
of gbm and gralloc. This change redirects gbm calls to the
private API.
TEST=Ran graphics_Gbm on minnie and cyan, and checked if Chrome boots.
BUG=chromium:616275
CQ-DEPEND=CL:367791
Change-Id: I50d10f9d6c7ea936b0d76c5299a58d948939fdf9
Reviewed-on: https://chromium-review.googlesource.com/367780
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
diff --git a/i915.c b/i915.c
index 88d55e5..787749f 100644
--- a/i915.c
+++ b/i915.c
@@ -4,7 +4,7 @@
* found in the LICENSE file.
*/
-#ifdef GBM_I915
+#ifdef DRV_I915
#include <stdio.h>
#include <errno.h>
@@ -13,11 +13,11 @@
#include <xf86drm.h>
#include <i915_drm.h>
-#include "gbm_priv.h"
+#include "drv_priv.h"
#include "helpers.h"
#include "util.h"
-struct gbm_i915_device
+struct i915_device
{
int gen;
};
@@ -35,44 +35,44 @@
return 4;
}
-static int gbm_i915_init(struct gbm_device *gbm)
+static int drv_i915_init(struct driver *drv)
{
- struct gbm_i915_device *i915_gbm;
+ struct i915_device *i915_drv;
drm_i915_getparam_t get_param;
int device_id;
int ret;
- i915_gbm = (struct gbm_i915_device*)malloc(sizeof(*i915_gbm));
- if (!i915_gbm)
+ i915_drv = (struct i915_device*)malloc(sizeof(*i915_drv));
+ if (!i915_drv)
return -1;
memset(&get_param, 0, sizeof(get_param));
get_param.param = I915_PARAM_CHIPSET_ID;
get_param.value = &device_id;
- ret = drmIoctl(gbm->fd, DRM_IOCTL_I915_GETPARAM, &get_param);
+ ret = drmIoctl(drv->fd, DRM_IOCTL_I915_GETPARAM, &get_param);
if (ret) {
- fprintf(stderr, "minigbm: DRM_IOCTL_I915_GETPARAM failed\n");
- free(i915_gbm);
+ fprintf(stderr, "drv: DRM_IOCTL_I915_GETPARAM failed\n");
+ free(i915_drv);
return -1;
}
- i915_gbm->gen = get_gen(device_id);
+ i915_drv->gen = get_gen(device_id);
- gbm->priv = i915_gbm;
+ drv->priv = i915_drv;
return 0;
}
-static void gbm_i915_close(struct gbm_device *gbm)
+static void drv_i915_close(struct driver *drv)
{
- free(gbm->priv);
- gbm->priv = NULL;
+ free(drv->priv);
+ drv->priv = NULL;
}
-static void i915_align_dimensions(struct gbm_device *gbm, uint32_t tiling_mode,
+static void i915_align_dimensions(struct driver *drv, uint32_t tiling_mode,
uint32_t *width, uint32_t *height, int bpp)
{
- struct gbm_i915_device *i915_gbm = (struct gbm_i915_device *)gbm->priv;
+ struct i915_device *i915_drv = (struct i915_device *)drv->priv;
uint32_t width_alignment = 4, height_alignment = 4;
switch(tiling_mode) {
@@ -87,7 +87,7 @@
break;
case I915_TILING_Y:
- if (i915_gbm->gen == 3) {
+ if (i915_drv->gen == 3) {
width_alignment = 512 / bpp;
height_alignment = 8;
} else {
@@ -97,7 +97,7 @@
break;
}
- if (i915_gbm->gen > 3) {
+ if (i915_drv->gen > 3) {
*width = ALIGN(*width, width_alignment);
*height = ALIGN(*height, height_alignment);
} else {
@@ -109,49 +109,49 @@
}
}
-static int i915_verify_dimensions(struct gbm_device *gbm, uint32_t stride,
+static int i915_verify_dimensions(struct driver *drv, uint32_t stride,
uint32_t height)
{
- struct gbm_i915_device *i915_gbm = (struct gbm_i915_device *)gbm->priv;
- if (i915_gbm->gen <= 3 && stride > 8192)
+ struct i915_device *i915_drv = (struct i915_device *)drv->priv;
+ if (i915_drv->gen <= 3 && stride > 8192)
return 0;
return 1;
}
-static int gbm_i915_bo_create(struct gbm_bo *bo,
+static int drv_i915_bo_create(struct bo *bo,
uint32_t width, uint32_t height,
uint32_t format, uint32_t flags)
{
- struct gbm_device *gbm = bo->gbm;
- int bpp = gbm_stride_from_format(format, 1);
+ struct driver *drv = bo->drv;
+ int bpp = drv_stride_from_format(format, 1);
struct drm_i915_gem_create gem_create;
struct drm_i915_gem_set_tiling gem_set_tiling;
uint32_t tiling_mode = I915_TILING_NONE;
size_t size;
int ret;
- if (flags & (GBM_BO_USE_CURSOR | GBM_BO_USE_LINEAR))
+ if (flags & (DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR))
tiling_mode = I915_TILING_NONE;
- else if (flags & GBM_BO_USE_SCANOUT)
+ else if (flags & DRV_BO_USE_SCANOUT)
tiling_mode = I915_TILING_X;
- else if (flags & GBM_BO_USE_RENDERING)
+ else if (flags & DRV_BO_USE_RENDERING)
tiling_mode = I915_TILING_Y;
- i915_align_dimensions(gbm, tiling_mode, &width, &height, bpp);
+ i915_align_dimensions(drv, tiling_mode, &width, &height, bpp);
bo->strides[0] = width * bpp;
- if (!i915_verify_dimensions(gbm, bo->strides[0], height))
+ if (!i915_verify_dimensions(drv, bo->strides[0], height))
return EINVAL;
memset(&gem_create, 0, sizeof(gem_create));
size = width * height * bpp;
gem_create.size = size;
- ret = drmIoctl(gbm->fd, DRM_IOCTL_I915_GEM_CREATE, &gem_create);
+ ret = drmIoctl(drv->fd, DRM_IOCTL_I915_GEM_CREATE, &gem_create);
if (ret) {
- fprintf(stderr, "minigbm: DRM_IOCTL_I915_GEM_CREATE failed "
+ fprintf(stderr, "drv: DRM_IOCTL_I915_GEM_CREATE failed "
"(size=%zu)\n", size);
return ret;
}
@@ -164,49 +164,49 @@
gem_set_tiling.handle = bo->handles[0].u32;
gem_set_tiling.tiling_mode = tiling_mode;
gem_set_tiling.stride = bo->strides[0];
- ret = drmIoctl(gbm->fd, DRM_IOCTL_I915_GEM_SET_TILING,
+ ret = drmIoctl(drv->fd, DRM_IOCTL_I915_GEM_SET_TILING,
&gem_set_tiling);
} while (ret == -1 && (errno == EINTR || errno == EAGAIN));
if (ret == -1) {
struct drm_gem_close gem_close;
gem_close.handle = bo->handles[0].u32;
- fprintf(stderr, "minigbm: DRM_IOCTL_I915_GEM_SET_TILING failed "
+ fprintf(stderr, "drv: DRM_IOCTL_I915_GEM_SET_TILING failed "
"errno=%x (handle=%x, tiling=%x, stride=%x)\n",
errno,
gem_set_tiling.handle,
gem_set_tiling.tiling_mode,
gem_set_tiling.stride);
- drmIoctl(gbm->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
+ drmIoctl(drv->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
return -errno;
}
return 0;
}
-const struct gbm_driver gbm_driver_i915 =
+const struct backend backend_i915 =
{
.name = "i915",
- .init = gbm_i915_init,
- .close = gbm_i915_close,
- .bo_create = gbm_i915_bo_create,
- .bo_destroy = gbm_gem_bo_destroy,
+ .init = drv_i915_init,
+ .close = drv_i915_close,
+ .bo_create = drv_i915_bo_create,
+ .bo_destroy = drv_gem_bo_destroy,
.format_list = {
- {GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_LINEAR},
- {GBM_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_LINEAR},
- {GBM_FORMAT_XBGR8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_ABGR8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_XRGB1555, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_ARGB1555, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_RGB565, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_UYVY, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_UYVY, GBM_BO_USE_SCANOUT | GBM_BO_USE_LINEAR},
- {GBM_FORMAT_YUYV, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING},
- {GBM_FORMAT_YUYV, GBM_BO_USE_SCANOUT | GBM_BO_USE_LINEAR},
- {GBM_FORMAT_R8, GBM_BO_USE_RENDERING | GBM_BO_USE_LINEAR},
- {GBM_FORMAT_GR88, GBM_BO_USE_RENDERING | GBM_BO_USE_LINEAR},
+ {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
+ {DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
+ {DRV_FORMAT_XBGR8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_ABGR8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_XRGB1555, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_ARGB1555, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_RGB565, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_UYVY, DRV_BO_USE_SCANOUT | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_UYVY, DRV_BO_USE_SCANOUT | DRV_BO_USE_LINEAR},
+ {DRV_FORMAT_YUYV, DRV_BO_USE_SCANOUT | DRV_BO_USE_RENDERING},
+ {DRV_FORMAT_YUYV, DRV_BO_USE_SCANOUT | DRV_BO_USE_LINEAR},
+ {DRV_FORMAT_R8, DRV_BO_USE_RENDERING | DRV_BO_USE_LINEAR},
+ {DRV_FORMAT_GR88, DRV_BO_USE_RENDERING | DRV_BO_USE_LINEAR},
}
};