minigbm: rename DRV_BO_USE_* to BO_USE_*

It's somewhat easier to read.

BUG=none
TEST=minigbm still builds

CQ-DEPEND=CL:416290

Change-Id: I9417caff22ea66e4179fe41d534d8cb9510ef7a3
Reviewed-on: https://chromium-review.googlesource.com/414585
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/amdgpu.c b/amdgpu.c
index 32170cb..38ea8d6 100644 (file)
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -39,11 +39,11 @@ enum {
 };
 
 static struct supported_combination combos[5] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 };
 
 static int amdgpu_set_metadata(int fd, uint32_t handle,
@@ -156,7 +156,7 @@ static int amdgpu_addrlib_compute(void *addrlib, uint32_t width,
 
        /* Set the requested tiling mode. */
        addr_surf_info_in.tileMode = ADDR_TM_2D_TILED_THIN1;
-       if (usage & (DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR))
+       if (usage & (BO_USE_CURSOR | BO_USE_LINEAR))
                addr_surf_info_in.tileMode = ADDR_TM_LINEAR_ALIGNED;
        if (width <= 16 || height <= 16)
                addr_surf_info_in.tileMode = ADDR_TM_1D_TILED_THIN1;
@@ -174,7 +174,7 @@ static int amdgpu_addrlib_compute(void *addrlib, uint32_t width,
        addr_surf_info_in.flags.noStencil = 1;
 
        /* Set the micro tile type. */
-       if (usage & DRV_BO_USE_SCANOUT)
+       if (usage & BO_USE_SCANOUT)
                addr_surf_info_in.tileType = ADDR_DISPLAYABLE;
        else
                addr_surf_info_in.tileType = ADDR_NON_DISPLAYABLE;

diff --git a/cirrus.c b/cirrus.c
index 4958fef..91466c9 100644 (file)
--- a/cirrus.c
+++ b/cirrus.c
@@ -9,11 +9,11 @@
 #include "util.h"
 
 static struct supported_combination combos[5] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_RGB888,   DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_RGB888,   DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 };
 
 static int cirrus_init(struct driver *drv)

diff --git a/cros_gralloc/cros_gralloc_helpers.cc b/cros_gralloc/cros_gralloc_helpers.cc
index 36f56b8..0b06ef0 100644 (file)
--- a/cros_gralloc/cros_gralloc_helpers.cc
+++ b/cros_gralloc/cros_gralloc_helpers.cc
@@ -13,45 +13,45 @@
 
 uint64_t cros_gralloc_convert_flags(int flags)
 {
-       uint64_t usage = DRV_BO_USE_NONE;
+       uint64_t usage = BO_USE_NONE;
 
        if (flags & GRALLOC_USAGE_CURSOR)
-               usage |= DRV_BO_USE_CURSOR;
+               usage |= BO_USE_CURSOR;
        if ((flags & sw_read()) == GRALLOC_USAGE_SW_READ_RARELY)
-               usage |= DRV_BO_USE_SW_READ_RARELY;
+               usage |= BO_USE_SW_READ_RARELY;
        if ((flags & sw_read()) == GRALLOC_USAGE_SW_READ_OFTEN)
-               usage |= DRV_BO_USE_SW_READ_OFTEN;
+               usage |= BO_USE_SW_READ_OFTEN;
        if ((flags & sw_write()) == GRALLOC_USAGE_SW_WRITE_RARELY)
-               usage |= DRV_BO_USE_SW_WRITE_RARELY;
+               usage |= BO_USE_SW_WRITE_RARELY;
        if ((flags & sw_write()) == GRALLOC_USAGE_SW_WRITE_OFTEN)
-               usage |= DRV_BO_USE_SW_WRITE_OFTEN;
+               usage |= BO_USE_SW_WRITE_OFTEN;
        if (flags & GRALLOC_USAGE_HW_TEXTURE)
-               usage |= DRV_BO_USE_RENDERING;
+               usage |= BO_USE_RENDERING;
        if (flags & GRALLOC_USAGE_HW_RENDER)
-               usage |= DRV_BO_USE_RENDERING;
+               usage |= BO_USE_RENDERING;
        if (flags & GRALLOC_USAGE_HW_2D)
-               usage |= DRV_BO_USE_RENDERING;
+               usage |= BO_USE_RENDERING;
        if (flags & GRALLOC_USAGE_HW_COMPOSER)
        /* HWC wants to use display hardware, but can defer to OpenGL. */
-               usage |= DRV_BO_USE_SCANOUT | DRV_BO_USE_RENDERING;
+               usage |= BO_USE_SCANOUT | BO_USE_RENDERING;
        if (flags & GRALLOC_USAGE_HW_FB)
-               usage |= DRV_BO_USE_SCANOUT;
+               usage |= BO_USE_SCANOUT;
        if (flags & GRALLOC_USAGE_EXTERNAL_DISP)
        /* We're ignoring this flag until we decide what to with display link */
-               usage |= DRV_BO_USE_NONE;
+               usage |= BO_USE_NONE;
        if (flags & GRALLOC_USAGE_PROTECTED)
-               usage |= DRV_BO_USE_PROTECTED;
+               usage |= BO_USE_PROTECTED;
        if (flags & GRALLOC_USAGE_HW_VIDEO_ENCODER)
                /*HACK: See b/30054495 */
-               usage |= DRV_BO_USE_SW_READ_OFTEN;
+               usage |= BO_USE_SW_READ_OFTEN;
        if (flags & GRALLOC_USAGE_HW_CAMERA_WRITE)
-               usage |= DRV_BO_USE_HW_CAMERA_WRITE;
+               usage |= BO_USE_HW_CAMERA_WRITE;
        if (flags & GRALLOC_USAGE_HW_CAMERA_READ)
-               usage |= DRV_BO_USE_HW_CAMERA_READ;
+               usage |= BO_USE_HW_CAMERA_READ;
        if (flags & GRALLOC_USAGE_HW_CAMERA_ZSL)
-               usage |= DRV_BO_USE_HW_CAMERA_ZSL;
+               usage |= BO_USE_HW_CAMERA_ZSL;
        if (flags & GRALLOC_USAGE_RENDERSCRIPT)
-               usage |= DRV_BO_USE_RENDERSCRIPT;
+               usage |= BO_USE_RENDERSCRIPT;
 
        return usage;
 }

diff --git a/drv.c b/drv.c
index 8861536..3a9ab4c 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -180,7 +180,7 @@ int drv_is_combination_supported(struct driver *drv, uint32_t format,
                                 uint64_t usage, uint64_t modifier)
 {
 
-       if (format == DRM_FORMAT_NONE || usage == DRV_BO_USE_NONE)
+       if (format == DRM_FORMAT_NONE || usage == BO_USE_NONE)
                return 0;
 
        list_for_each_entry(struct combination_list_element, elem,

diff --git a/drv.h b/drv.h
index c567fb9..83d3b6a 100644 (file)
--- a/drv.h
+++ b/drv.h
@@ -17,25 +17,25 @@ extern "C" {
 #define DRV_MAX_PLANES 4
 
 /* Use flags */
-#define DRV_BO_USE_NONE                                 0
-#define DRV_BO_USE_SCANOUT             (1ull << 0)
-#define DRV_BO_USE_CURSOR              (1ull << 1)
-#define DRV_BO_USE_CURSOR_64X64                DRV_BO_USE_CURSOR
-#define DRV_BO_USE_RENDERING           (1ull << 2)
-#define DRV_BO_USE_LINEAR              (1ull << 3)
-#define DRV_BO_USE_SW_READ_NEVER       (1ull << 4)
-#define DRV_BO_USE_SW_READ_RARELY      (1ull << 5)
-#define DRV_BO_USE_SW_READ_OFTEN       (1ull << 6)
-#define DRV_BO_USE_SW_WRITE_NEVER      (1ull << 7)
-#define DRV_BO_USE_SW_WRITE_RARELY     (1ull << 8)
-#define DRV_BO_USE_SW_WRITE_OFTEN      (1ull << 9)
-#define DRV_BO_USE_EXTERNAL_DISP       (1ull << 10)
-#define DRV_BO_USE_PROTECTED           (1ull << 11)
-#define DRV_BO_USE_HW_VIDEO_ENCODER    (1ull << 12)
-#define DRV_BO_USE_HW_CAMERA_WRITE     (1ull << 13)
-#define DRV_BO_USE_HW_CAMERA_READ      (1ull << 14)
-#define DRV_BO_USE_HW_CAMERA_ZSL       (1ull << 15)
-#define DRV_BO_USE_RENDERSCRIPT                (1ull << 16)
+#define BO_USE_NONE                    0
+#define BO_USE_SCANOUT                 (1ull << 0)
+#define BO_USE_CURSOR                  (1ull << 1)
+#define BO_USE_CURSOR_64X64            BO_USE_CURSOR
+#define BO_USE_RENDERING               (1ull << 2)
+#define BO_USE_LINEAR                  (1ull << 3)
+#define BO_USE_SW_READ_NEVER           (1ull << 4)
+#define BO_USE_SW_READ_RARELY          (1ull << 5)
+#define BO_USE_SW_READ_OFTEN           (1ull << 6)
+#define BO_USE_SW_WRITE_NEVER          (1ull << 7)
+#define BO_USE_SW_WRITE_RARELY         (1ull << 8)
+#define BO_USE_SW_WRITE_OFTEN          (1ull << 9)
+#define BO_USE_EXTERNAL_DISP           (1ull << 10)
+#define BO_USE_PROTECTED               (1ull << 11)
+#define BO_USE_HW_VIDEO_ENCODER                (1ull << 12)
+#define BO_USE_HW_CAMERA_WRITE         (1ull << 13)
+#define BO_USE_HW_CAMERA_READ          (1ull << 14)
+#define BO_USE_HW_CAMERA_ZSL           (1ull << 15)
+#define BO_USE_RENDERSCRIPT            (1ull << 16)
 
 /* This is our extension to <drm_fourcc.h>.  We need to make sure we don't step
  * on the namespace of already defined formats, which can be done by using invalid

diff --git a/evdi.c b/evdi.c
index 610ccb1..97042d1 100644 (file)
--- a/evdi.c
+++ b/evdi.c
@@ -9,10 +9,10 @@
 #include "util.h"
 
 static struct supported_combination combos[4] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 };
 
 static int evdi_init(struct driver *drv)

diff --git a/exynos.c b/exynos.c
index c5e1759..d6dc7de 100644 (file)
--- a/exynos.c
+++ b/exynos.c
@@ -18,11 +18,11 @@
 #include "util.h"
 
 static struct supported_combination combos[5] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_NV12, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_NV12, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 };
 
 static int exynos_init(struct driver *drv)

diff --git a/gbm_helpers.c b/gbm_helpers.c
index 9d4645b..be18a39 100644 (file)
--- a/gbm_helpers.c
+++ b/gbm_helpers.c
@@ -12,18 +12,18 @@
 
 uint64_t gbm_convert_flags(uint32_t flags)
 {
-       uint64_t usage = DRV_BO_USE_NONE;
+       uint64_t usage = BO_USE_NONE;
 
        if (flags & GBM_BO_USE_SCANOUT)
-               usage |= DRV_BO_USE_SCANOUT;
+               usage |= BO_USE_SCANOUT;
        if (flags & GBM_BO_USE_CURSOR)
-               usage |= DRV_BO_USE_CURSOR;
+               usage |= BO_USE_CURSOR;
        if (flags & GBM_BO_USE_CURSOR_64X64)
-               usage |= DRV_BO_USE_CURSOR_64X64;
+               usage |= BO_USE_CURSOR_64X64;
        if (flags & GBM_BO_USE_RENDERING)
-               usage |= DRV_BO_USE_RENDERING;
+               usage |= BO_USE_RENDERING;
        if (flags & GBM_BO_USE_LINEAR)
-               usage |= DRV_BO_USE_LINEAR;
+               usage |= BO_USE_LINEAR;
 
        return usage;
 }

diff --git a/gma500.c b/gma500.c
index bbe2091..0f78e85 100644 (file)
--- a/gma500.c
+++ b/gma500.c
@@ -9,8 +9,8 @@
 #include "util.h"
 
 static struct supported_combination combos[2] = {
-       {DRM_FORMAT_RGBX8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_RGBX8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_RGBX8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_RGBX8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 };
 
 static int gma500_init(struct driver *drv)

diff --git a/helpers.c b/helpers.c
index 75c982f..23d17bd 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -348,9 +348,9 @@ int drv_add_kms_flags(struct driver *drv)
         * of ARGB unless it's an overlay plane.
         */
        drv_modify_supported_combination(drv, DRM_FORMAT_XRGB8888,
-                                        DRV_BO_USE_SCANOUT, 0);
+                                        BO_USE_SCANOUT, 0);
        drv_modify_supported_combination(drv, DRM_FORMAT_ARGB8888,
-                                        DRV_BO_USE_SCANOUT, 0);
+                                        BO_USE_SCANOUT, 0);
 
        /*
         * The ability to return universal planes is only complete on
@@ -392,10 +392,10 @@ int drv_add_kms_flags(struct driver *drv)
                switch (flag) {
                case DRM_PLANE_TYPE_OVERLAY:
                case DRM_PLANE_TYPE_PRIMARY:
-                       usage = DRV_BO_USE_SCANOUT;
+                       usage = BO_USE_SCANOUT;
                        break;
                case DRM_PLANE_TYPE_CURSOR:
-                       usage = DRV_BO_USE_CURSOR;
+                       usage = BO_USE_CURSOR;
                        break;
                default:
                        assert(0);

diff --git a/i915.c b/i915.c
index 712fd01..769e6a3 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -19,41 +19,41 @@
 
 static struct supported_combination combos[18] = {
        {DRM_FORMAT_ARGB1555, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_GR88, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_R8, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_RGB565, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_UYVY, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_UYVY, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XRGB1555, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_YUYV, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_YUYV, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
 };
 
 struct i915_device
@@ -169,10 +169,10 @@ static int i915_bo_create(struct bo *bo, uint32_t width, uint32_t height,
        size_t plane;
        int ret;
 
-       if (flags & (DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR |
-                    DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN))
+       if (flags & (BO_USE_CURSOR | BO_USE_LINEAR |
+                    BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN))
                tiling_mode = I915_TILING_NONE;
-       else if (flags & DRV_BO_USE_SCANOUT)
+       else if (flags & BO_USE_SCANOUT)
                tiling_mode = I915_TILING_X;
        else
                tiling_mode = I915_TILING_Y;

diff --git a/marvell.c b/marvell.c
index 73f7d9a..e088db6 100644 (file)
--- a/marvell.c
+++ b/marvell.c
@@ -11,10 +11,10 @@
 #include "util.h"
 
 static struct supported_combination combos[4] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 }
 
 static int marvell_init(struct driver *drv)

diff --git a/mediatek.c b/mediatek.c
index 23b1dd2..307af84 100644 (file)
--- a/mediatek.c
+++ b/mediatek.c
@@ -18,23 +18,23 @@
 
 static struct supported_combination combos[8] = {
        {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN |
-               DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN |
+               BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_RGB565, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN |
-               DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN |
+               BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
 };
 
 static int mediatek_init(struct driver *drv)

diff --git a/rockchip.c b/rockchip.c
index 59e44c2..02a5c47 100644 (file)
--- a/rockchip.c
+++ b/rockchip.c
@@ -19,29 +19,29 @@
 
 static struct supported_combination combos[11] = {
        {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN |
-               DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN |
+               BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_NV12, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_NV12, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_RGB565, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN |
-               DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN |
+               BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
 };
 
 static int rockchip_init(struct driver *drv)

diff --git a/tegra.c b/tegra.c
index 513229c..49f3c6a 100644 (file)
--- a/tegra.c
+++ b/tegra.c
@@ -35,13 +35,13 @@ enum nv_mem_kind
 
 static struct supported_combination combos[4] = {
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_CURSOR | BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
 };
 
 static int compute_block_height_log2(int height)
@@ -112,7 +112,7 @@ static int tegra_bo_create(struct bo *bo, uint32_t width, uint32_t height,
        struct drm_tegra_gem_create gem_create;
        int ret;
 
-       if (flags & DRV_BO_USE_RENDERING)
+       if (flags & BO_USE_RENDERING)
                compute_layout_blocklinear(width, height, format, &kind,
                                           &block_height_log2, &stride, &size);
        else

diff --git a/udl.c b/udl.c
index 2608afb..a4fb07b 100644 (file)
--- a/udl.c
+++ b/udl.c
@@ -9,10 +9,10 @@
 #include "util.h"
 
 static struct supported_combination combos[4] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 };
 
 static int udl_init(struct driver *drv)

diff --git a/vgem.c b/vgem.c
index ae845d3..3b6fb5a 100644 (file)
--- a/vgem.c
+++ b/vgem.c
@@ -10,9 +10,9 @@
 
 static struct supported_combination combos[2] = {
        {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
+               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
        {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
 };
 
 static int vgem_init(struct driver *drv)

diff --git a/virtio_gpu.c b/virtio_gpu.c
index d711f82..f169101 100644 (file)
--- a/virtio_gpu.c
+++ b/virtio_gpu.c
@@ -9,10 +9,10 @@
 #include "util.h"
 
 static struct supported_combination combos[4] = {
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, DRV_BO_USE_RENDERING},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_LINEAR},
+       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_RENDERING},
 };
 
 static int virtio_gpu_init(struct driver *drv)