revamp formats

1 files changed, 393 insertions, 14 deletions

diff --git a/drmtools.c b/drmtools.c
index 042b8d6..b3b3a9b 100644
--- a/drmtools.c
+++ b/drmtools.c
@@ -8,14 +8,392 @@
 #include <inttypes.h>
 
 #include <sys/ioctl.h>
+#include <drm/drm_fourcc.h>
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
+#include <cairo.h>
+
 #include "drmtools.h"
 
 /* ------------------------------------------------------------------ */
 
+#define FOURCC_NAME(_fcc) {                     \
+        (_fcc >>  0) & 0xff,                    \
+        (_fcc >>  8) & 0xff,                    \
+        (_fcc >> 16) & 0xff,                    \
+        (_fcc >> 24) & 0xff,                    \
+        0 }
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+# define LE_BE(_le, _be) (_le)
+#endif
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define LE_BE(_le, _be) (_be)
+#endif
+
+const struct fbformat fmts[] = {
+
+    /*
+     * -----------------------------------------------------------------
+     * legacy formats, native endian (DRM_IOCTL_MODE_ADDFB)
+     */
+    {
+        .name   = "24",
+        .fields = "x:R:G:B",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .depth  = 24,
+        .cairo  = CAIRO_FORMAT_RGB24,
+    },{
+        .name   = "30",
+        .fields = "x:R:G:B",
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .depth  = 30,
+        .cairo  = CAIRO_FORMAT_RGB30,
+    },{
+        .name   = "15",
+        .fields = "x:R:G:B",
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .depth  = 15,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = "16",
+        .fields = "R:G:B",
+        .bits   = "5:6:5",
+        .bpp    = 16,
+        .depth  = 16,
+        .cairo  = CAIRO_FORMAT_RGB16_565,
+    },
+
+    /*
+     * -----------------------------------------------------------------
+     * fourcc formats, little endian (DRM_IOCTL_MODE_ADDFB2)
+     */
+
+    /* --- 8 bpp, rgb --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_RGB332),
+        .fields = "R:G:B",
+        .bits   = "3:3:2",
+        .bpp    = 8,
+        .fourcc = DRM_FORMAT_RGB332,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGR233),
+        .fields = "B:G:R",
+        .bits   = "2:3:3",
+        .bpp    = 8,
+        .fourcc = DRM_FORMAT_BGR233,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },
+
+    /* -- 16 bpp, rgb --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_XRGB4444),
+        .fields = "x:R:G:B",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XRGB4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XBGR4444),
+        .fields = "x:B:G:R",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XBGR4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBX4444),
+        .fields = "R:G:B:x",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBX4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRX4444),
+        .fields = "B:G:R:x",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRX4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ARGB4444),
+        .fields = "A:R:G:B",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ARGB4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ABGR4444),
+        .fields = "A:B:G:R",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ABGR4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBA4444),
+        .fields = "R:G:B:A",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBA4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRA4444),
+        .fields = "B:G:R:A",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRA4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XRGB1555),
+        .fields = "x:R:G:B",
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XRGB1555,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XBGR1555),
+        .fields = "x:B:G:R",
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XBGR1555,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBX5551),
+        .fields = "R:G:B:x",
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBX5551,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRX5551),
+        .fields = "B:G:R:x",
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRX5551,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ARGB1555),
+        .fields = "A:R:G:B",
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ARGB1555,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ABGR1555),
+        .fields = "A:B:G:R",
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ABGR1555,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBA5551),
+        .fields = "R:G:B:A",
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBA5551,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRA5551),
+        .fields = "B:G:R:A",
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRA5551,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGB565),
+        .fields = "R:G:B",
+        .bits   = "5:6:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGB565,
+        .cairo  = LE_BE(CAIRO_FORMAT_RGB16_565, CAIRO_FORMAT_INVALID),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGR565),
+        .fields = "B:G:R",
+        .bits   = "5:6:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGR565,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },
+
+    /* --- 24 bpp, rgb --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_RGB888),
+        .fields = "R:G:B",
+        .bits   = "8:8:8",
+        .bpp    = 24,
+        .fourcc = DRM_FORMAT_RGB888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGR888),
+        .fields = "B:G:R",
+        .bits   = "8:8:8",
+        .bpp    = 24,
+        .fourcc = DRM_FORMAT_BGR888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },
+
+    /* --- 32 bpp, rgb --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_XRGB8888),
+        .fields = "x:R:G:B",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_XRGB8888,
+        .cairo  = LE_BE(CAIRO_FORMAT_RGB24, CAIRO_FORMAT_INVALID),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XBGR8888),
+        .fields = "x:B:G:R",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_XBGR8888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBX8888),
+        .fields = "R:G:B:x",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_RGBX8888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRX8888),
+        .fields = "B:G:R:x",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_BGRX8888,
+        .cairo  = LE_BE(CAIRO_FORMAT_INVALID, CAIRO_FORMAT_RGB24),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ARGB8888),
+        .fields = "A:R:G:B",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_ARGB8888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ABGR8888),
+        .fields = "A:B:G:R",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_ABGR8888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBA8888),
+        .fields = "R:G:B:A",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_RGBA8888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRA8888),
+        .fields = "B:G:R:A",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_BGRA8888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XRGB2101010),
+        .fields = "x:R:G:B",
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_XRGB2101010,
+        .cairo  = LE_BE(CAIRO_FORMAT_RGB30, CAIRO_FORMAT_INVALID)
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XBGR2101010),
+        .fields = "x:B:G:R",
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_XBGR2101010,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBX1010102),
+        .fields = "R:G:B:x",
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_RGBX1010102,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRX1010102),
+        .fields = "B:G:R:x",
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_BGRX1010102,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ARGB2101010),
+        .fields = "A:R:G:B",
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_ARGB2101010,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ABGR2101010),
+        .fields = "A:B:G:R",
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_ABGR2101010,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBA1010102),
+        .fields = "R:G:B:A",
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_RGBA1010102,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRA1010102),
+        .fields = "B:G:R:A",
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_BGRA1010102,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },
+
+    /* --- 32 bpp, yuv --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_YUYV),
+        .fields = "Cr0:Y1:Cb0:Y0",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_YUYV,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_YVYU),
+        .fields = "Cb0:Y1:Cr0:Y0",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_YVYU,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_UYVY),
+        .fields = "Y1:Cr0:Y0:Cb0",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_UYVY,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_VYUY),
+        .fields = "Y1:Cb0:Y0:Cr0",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_VYUY,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_AYUV),
+        .fields = "A:Y:Cb:Cr",
+        .bits   = "8:8:8:8",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_AYUV,
+        .cairo  = CAIRO_FORMAT_INVALID,
+    },
+};
+const uint32_t fmtcnt = sizeof(fmts)/sizeof(fmts[0]);
+
+/* ------------------------------------------------------------------ */
+
 static const char *conn_type[] = {
     [ DRM_MODE_CONNECTOR_Unknown      ] = "Unknown",
     [ DRM_MODE_CONNECTOR_VGA          ] = "VGA",
@@ -93,7 +471,7 @@ void drm_conn_name(drmModeConnector *conn, char *dest, int dlen)
 
 /* ------------------------------------------------------------------ */
 
-bool drm_probe_format(int fd, uint32_t bpp, uint32_t depth, uint32_t fourcc, bool print)
+bool drm_probe_format(int fd, const struct fbformat *fmt)
 {
     struct drm_mode_create_dumb cd;
     struct drm_mode_destroy_dumb dd;
@@ -106,27 +484,19 @@ bool drm_probe_format(int fd, uint32_t bpp, uint32_t depth, uint32_t fourcc, boo
     memset(&cd, 0, sizeof(cd));
     cd.width = 64;
     cd.height = 64;
-    cd.bpp = bpp;
+    cd.bpp = fmt->bpp;
     rc = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &cd);
     if (rc < 0)
         goto done;
 
     /* create framebuffer */
-    if (fourcc) {
-        rc = drmModeAddFB2(fd, cd.width, cd.height, fourcc,
+    if (fmt->fourcc) {
+        rc = drmModeAddFB2(fd, cd.width, cd.height, fmt->fourcc,
                            &cd.handle, &cd.pitch, &zero,
                            &fb_id, 0);
-        if (rc == 0 && print)
-            printf("    bpp %d, fourcc %c%c%c%c\n", cd.bpp,
-                   (fourcc >>  0) & 0xff,
-                   (fourcc >>  8) & 0xff,
-                   (fourcc >> 16) & 0xff,
-                   (fourcc >> 24) & 0xff);
-    } else if (depth) {
-        rc = drmModeAddFB(fd, cd.width, cd.height, depth, cd.bpp,
+    } else if (fmt->depth) {
+        rc = drmModeAddFB(fd, cd.width, cd.height, fmt->depth, cd.bpp,
                           cd.pitch, cd.handle, &fb_id);
-        if (rc == 0 && print)
-            printf("    bpp %d, depth %d\n", cd.bpp, depth);
     } else {
         rc = -1;
     }
@@ -142,3 +512,12 @@ bool drm_probe_format(int fd, uint32_t bpp, uint32_t depth, uint32_t fourcc, boo
 done:
     return result;
 }
+
+void drm_print_format(FILE *fp, const struct fbformat *fmt)
+{
+    fprintf(fp, "    %-8s:  [%2d:0]  %-14s %-11s %s\n",
+            fmt->name, fmt->bpp - 1, fmt->fields, fmt->bits,
+            fmt->fourcc
+            ? "fourcc (addfb2), little endian"
+            : "legacy (addfb), native endian");
+}