-#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_HW_TEXTURE (1ull << 10)
-#define DRV_BO_USE_HW_RENDER (1ull << 11)
-#define DRV_BO_USE_HW_2D (1ull << 12)
-#define DRV_BO_USE_HW_COMPOSER (1ull << 13)
-#define DRV_BO_USE_HW_FB (1ull << 14)
-#define DRV_BO_USE_EXTERNAL_DISP (1ull << 15)
-#define DRV_BO_USE_PROTECTED (1ull << 16)
-#define DRV_BO_USE_HW_VIDEO_ENCODER (1ull << 17)
-#define DRV_BO_USE_HW_CAMERA_WRITE (1ull << 18)
-#define DRV_BO_USE_HW_CAMERA_READ (1ull << 19)
-#define DRV_BO_USE_HW_CAMERA_ZSL (1ull << 20)
-#define DRV_BO_USE_RENDERSCRIPT (1ull << 21)
-
-typedef enum {
- DRV_FORMAT_NONE,
- DRV_FORMAT_C8,
- DRV_FORMAT_R8,
- DRV_FORMAT_RG88,
- DRV_FORMAT_GR88,
- DRV_FORMAT_RGB332,
- DRV_FORMAT_BGR233,
- DRV_FORMAT_XRGB4444,
- DRV_FORMAT_XBGR4444,
- DRV_FORMAT_RGBX4444,
- DRV_FORMAT_BGRX4444,
- DRV_FORMAT_ARGB4444,
- DRV_FORMAT_ABGR4444,
- DRV_FORMAT_RGBA4444,
- DRV_FORMAT_BGRA4444,
- DRV_FORMAT_XRGB1555,
- DRV_FORMAT_XBGR1555,
- DRV_FORMAT_RGBX5551,
- DRV_FORMAT_BGRX5551,
- DRV_FORMAT_ARGB1555,
- DRV_FORMAT_ABGR1555,
- DRV_FORMAT_RGBA5551,
- DRV_FORMAT_BGRA5551,
- DRV_FORMAT_RGB565,
- DRV_FORMAT_BGR565,
- DRV_FORMAT_RGB888,
- DRV_FORMAT_BGR888,
- DRV_FORMAT_XRGB8888,
- DRV_FORMAT_XBGR8888,
- DRV_FORMAT_RGBX8888,
- DRV_FORMAT_BGRX8888,
- DRV_FORMAT_ARGB8888,
- DRV_FORMAT_ABGR8888,
- DRV_FORMAT_RGBA8888,
- DRV_FORMAT_BGRA8888,
- DRV_FORMAT_XRGB2101010,
- DRV_FORMAT_XBGR2101010,
- DRV_FORMAT_RGBX1010102,
- DRV_FORMAT_BGRX1010102,
- DRV_FORMAT_ARGB2101010,
- DRV_FORMAT_ABGR2101010,
- DRV_FORMAT_RGBA1010102,
- DRV_FORMAT_BGRA1010102,
- DRV_FORMAT_YUYV,
- DRV_FORMAT_YVYU,
- DRV_FORMAT_UYVY,
- DRV_FORMAT_VYUY,
- DRV_FORMAT_AYUV,
- DRV_FORMAT_NV12,
- DRV_FORMAT_NV21,
- DRV_FORMAT_NV16,
- DRV_FORMAT_NV61,
- DRV_FORMAT_YUV410,
- DRV_FORMAT_YVU410,
- DRV_FORMAT_YUV411,
- DRV_FORMAT_YVU411,
- DRV_FORMAT_YUV420,
- DRV_FORMAT_YVU420,
- DRV_FORMAT_YUV422,
- DRV_FORMAT_YVU422,
- DRV_FORMAT_YUV444,
- DRV_FORMAT_YVU444,
- DRV_FORMAT_FLEX_IMPLEMENTATION_DEFINED,
- DRV_FORMAT_FLEX_YCbCr_420_888,
-} drv_format_t;
+#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_CAMERA_WRITE (1ull << 13)
+#define BO_USE_CAMERA_READ (1ull << 14)
+#define BO_USE_RENDERSCRIPT (1ull << 16)
+#define BO_USE_TEXTURE (1ull << 17)
+
+/* Map flags */
+#define BO_MAP_NONE 0
+#define BO_MAP_READ (1 << 0)
+#define BO_MAP_WRITE (1 << 1)
+#define BO_MAP_READ_WRITE (BO_MAP_READ | BO_MAP_WRITE)
+
+/* 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
+ * fourcc codes.
+ */