]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - glsdk/libdrm.git/blobdiff - tests/modetest/modetest.c
modetest: fix uninitialized fourcc
[glsdk/libdrm.git] / tests / modetest / modetest.c
index c38908b067b8c6471062ae65a2ddcaeaf53714d2..e0fd66ca26148cd2c29f9cd92d46e97b04b53bd8 100644 (file)
  * TODO: use cairo to write the mode info on the selected output once
  *       the mode has been programmed, along with possible test patterns.
  */
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <inttypes.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/poll.h>
+#include <sys/time.h>
 
 #include "xf86drm.h"
 #include "xf86drmMode.h"
-#include "intel_bufmgr.h"
+#include "drm_fourcc.h"
+#include "libkms.h"
+
+#include "buffers.h"
 
 drmModeRes *resources;
 int fd, modes;
@@ -61,7 +69,7 @@ struct type_name {
 
 #define type_name_fn(res) \
 char * res##_str(int type) {                   \
-       int i;                                          \
+       unsigned int i;                                 \
        for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \
                if (res##_names[i].type == type)        \
                        return res##_names[i].name;     \
@@ -101,10 +109,55 @@ struct type_name connector_type_names[] = {
        { DRM_MODE_CONNECTOR_DisplayPort, "displayport" },
        { DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
        { DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
+       { DRM_MODE_CONNECTOR_TV, "TV" },
+       { DRM_MODE_CONNECTOR_eDP, "embedded displayport" },
 };
 
 type_name_fn(connector_type)
 
+#define bit_name_fn(res)                                       \
+char * res##_str(int type) {                                   \
+       int i;                                                  \
+       const char *sep = "";                                   \
+       for (i = 0; i < ARRAY_SIZE(res##_names); i++) {         \
+               if (type & (1 << i)) {                          \
+                       printf("%s%s", sep, res##_names[i]);    \
+                       sep = ", ";                             \
+               }                                               \
+       }                                                       \
+}
+
+static const char *mode_type_names[] = {
+       "builtin",
+       "clock_c",
+       "crtc_c",
+       "preferred",
+       "default",
+       "userdef",
+       "driver",
+};
+
+bit_name_fn(mode_type)
+
+static const char *mode_flag_names[] = {
+       "phsync",
+       "nhsync",
+       "pvsync",
+       "nvsync",
+       "interlace",
+       "dblscan",
+       "csync",
+       "pcsync",
+       "ncsync",
+       "hskew",
+       "bcast",
+       "pixmux",
+       "dblclk",
+       "clkdiv2"
+};
+
+bit_name_fn(mode_flag)
+
 void dump_encoders(void)
 {
        drmModeEncoder *encoder;
@@ -131,11 +184,11 @@ void dump_encoders(void)
        printf("\n");
 }
 
-void dump_mode(struct drm_mode_modeinfo *mode)
+void dump_mode(drmModeModeInfo *mode)
 {
-       printf("  %s %.02f %d %d %d %d %d %d %d %d\n",
+       printf("  %s %d %d %d %d %d %d %d %d %d",
               mode->name,
-              (float)mode->vrefresh / 1000,
+              mode->vrefresh,
               mode->hdisplay,
               mode->hsync_start,
               mode->hsync_end,
@@ -144,6 +197,107 @@ void dump_mode(struct drm_mode_modeinfo *mode)
               mode->vsync_start,
               mode->vsync_end,
               mode->vtotal);
+
+       printf(" flags: ");
+       mode_flag_str(mode->flags);
+       printf("; type: ");
+       mode_type_str(mode->type);
+       printf("\n");
+}
+
+static void
+dump_blob(uint32_t blob_id)
+{
+       uint32_t i;
+       unsigned char *blob_data;
+       drmModePropertyBlobPtr blob;
+
+       blob = drmModeGetPropertyBlob(fd, blob_id);
+       if (!blob)
+               return;
+
+       blob_data = blob->data;
+
+       for (i = 0; i < blob->length; i++) {
+               if (i % 16 == 0)
+                       printf("\n\t\t\t");
+               printf("%.2hhx", blob_data[i]);
+       }
+       printf("\n");
+
+       drmModeFreePropertyBlob(blob);
+}
+
+static void
+dump_prop(uint32_t prop_id, uint64_t value)
+{
+       int i;
+       drmModePropertyPtr prop;
+
+       prop = drmModeGetProperty(fd, prop_id);
+
+       printf("\t%d", prop_id);
+       if (!prop) {
+               printf("\n");
+               return;
+       }
+
+       printf(" %s:\n", prop->name);
+
+       printf("\t\tflags:");
+       if (prop->flags & DRM_MODE_PROP_PENDING)
+               printf(" pending");
+       if (prop->flags & DRM_MODE_PROP_RANGE)
+               printf(" range");
+       if (prop->flags & DRM_MODE_PROP_IMMUTABLE)
+               printf(" immutable");
+       if (prop->flags & DRM_MODE_PROP_ENUM)
+               printf(" enum");
+       if (prop->flags & DRM_MODE_PROP_BITMASK)
+               printf(" bitmask");
+       if (prop->flags & DRM_MODE_PROP_BLOB)
+               printf(" blob");
+       printf("\n");
+
+       if (prop->flags & DRM_MODE_PROP_RANGE) {
+               printf("\t\tvalues:");
+               for (i = 0; i < prop->count_values; i++)
+                       printf(" %"PRIu64, prop->values[i]);
+               printf("\n");
+       }
+
+       if (prop->flags & DRM_MODE_PROP_ENUM) {
+               printf("\t\tenums:");
+               for (i = 0; i < prop->count_enums; i++)
+                       printf(" %s=%llu", prop->enums[i].name,
+                              prop->enums[i].value);
+               printf("\n");
+       } else if (prop->flags & DRM_MODE_PROP_BITMASK) {
+               printf("\t\tvalues:");
+               for (i = 0; i < prop->count_enums; i++)
+                       printf(" %s=0x%llx", prop->enums[i].name,
+                              (1LL << prop->enums[i].value));
+               printf("\n");
+       } else {
+               assert(prop->count_enums == 0);
+       }
+
+       if (prop->flags & DRM_MODE_PROP_BLOB) {
+               printf("\t\tblobs:\n");
+               for (i = 0; i < prop->count_blobs; i++)
+                       dump_blob(prop->blob_ids[i]);
+               printf("\n");
+       } else {
+               assert(prop->count_blobs == 0);
+       }
+
+       printf("\t\tvalue:");
+       if (prop->flags & DRM_MODE_PROP_BLOB)
+               dump_blob(value);
+       else
+               printf(" %"PRIu64"\n", value);
+
+       drmModeFreeProperty(prop);
 }
 
 void dump_connectors(void)
@@ -152,7 +306,7 @@ void dump_connectors(void)
        int i, j;
 
        printf("Connectors:\n");
-       printf("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\n");
+       printf("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\tencoders\n");
        for (i = 0; i < resources->count_connectors; i++) {
                connector = drmModeGetConnector(fd, resources->connectors[i]);
 
@@ -162,7 +316,7 @@ void dump_connectors(void)
                        continue;
                }
 
-               printf("%d\t%d\t%s\t%s\t%dx%d\t\t%d\n",
+               printf("%d\t%d\t%s\t%s\t%dx%d\t\t%d\t",
                       connector->connector_id,
                       connector->encoder_id,
                       connector_status_str(connector->connection),
@@ -170,14 +324,22 @@ void dump_connectors(void)
                       connector->mmWidth, connector->mmHeight,
                       connector->count_modes);
 
-               if (!connector->count_modes)
-                       continue;
-
-               printf("  modes:\n");
-               printf("  name refresh (Hz) hdisp hss hse htot vdisp "
-                      "vss vse vtot)\n");
-               for (j = 0; j < connector->count_modes; j++)
-                       dump_mode(&connector->modes[j]);
+               for (j = 0; j < connector->count_encoders; j++)
+                       printf("%s%d", j > 0 ? ", " : "", connector->encoders[j]);
+               printf("\n");
+
+               if (connector->count_modes) {
+                       printf("  modes:\n");
+                       printf("\tname refresh (Hz) hdisp hss hse htot vdisp "
+                              "vss vse vtot)\n");
+                       for (j = 0; j < connector->count_modes; j++)
+                               dump_mode(&connector->modes[j]);
+
+                       printf("  props:\n");
+                       for (j = 0; j < connector->count_props; j++)
+                               dump_prop(connector->props[j],
+                                         connector->prop_values[j]);
+               }
 
                drmModeFreeConnector(connector);
        }
@@ -187,7 +349,9 @@ void dump_connectors(void)
 void dump_crtcs(void)
 {
        drmModeCrtc *crtc;
+       drmModeObjectPropertiesPtr props;
        int i;
+       uint32_t j;
 
        printf("CRTCs:\n");
        printf("id\tfb\tpos\tsize\n");
@@ -206,6 +370,19 @@ void dump_crtcs(void)
                       crtc->width, crtc->height);
                dump_mode(&crtc->mode);
 
+               printf("  props:\n");
+               props = drmModeObjectGetProperties(fd, crtc->crtc_id,
+                                                  DRM_MODE_OBJECT_CRTC);
+               if (props) {
+                       for (j = 0; j < props->count_props; j++)
+                               dump_prop(props->props[j],
+                                         props->prop_values[j]);
+                       drmModeFreeObjectProperties(props);
+               } else {
+                       printf("\tcould not get crtc properties: %s\n",
+                              strerror(errno));
+               }
+
                drmModeFreeCrtc(crtc);
        }
        printf("\n");
@@ -226,15 +403,78 @@ void dump_framebuffers(void)
                                resources->fbs[i], strerror(errno));
                        continue;
                }
-               printf("%d\t(%dx%d)\t%d\n",
+               printf("%u\t(%ux%u)\t%u\n",
                       fb->fb_id,
-                      fb->width, fb->height);
+                      fb->width, fb->height,
+                      fb->pitch);
 
                drmModeFreeFB(fb);
        }
        printf("\n");
 }
 
+static void dump_planes(void)
+{
+       drmModeObjectPropertiesPtr props;
+       drmModePlaneRes *plane_resources;
+       drmModePlane *ovr;
+       unsigned int i, j;
+
+       plane_resources = drmModeGetPlaneResources(fd);
+       if (!plane_resources) {
+               fprintf(stderr, "drmModeGetPlaneResources failed: %s\n",
+                       strerror(errno));
+               return;
+       }
+
+       printf("Planes:\n");
+       printf("id\tcrtc\tfb\tCRTC x,y\tx,y\tgamma size\n");
+       for (i = 0; i < plane_resources->count_planes; i++) {
+               ovr = drmModeGetPlane(fd, plane_resources->planes[i]);
+               if (!ovr) {
+                       fprintf(stderr, "drmModeGetPlane failed: %s\n",
+                               strerror(errno));
+                       continue;
+               }
+
+               printf("%d\t%d\t%d\t%d,%d\t\t%d,%d\t%d\n",
+                      ovr->plane_id, ovr->crtc_id, ovr->fb_id,
+                      ovr->crtc_x, ovr->crtc_y, ovr->x, ovr->y,
+                      ovr->gamma_size);
+
+               if (!ovr->count_formats)
+                       continue;
+
+               printf("  formats:");
+               for (j = 0; j < ovr->count_formats; j++)
+                       printf(" %4.4s", (char *)&ovr->formats[j]);
+               printf("\n");
+
+               printf("  props:\n");
+               props = drmModeObjectGetProperties(fd, ovr->plane_id,
+                                                  DRM_MODE_OBJECT_PLANE);
+               if (props) {
+                       for (j = 0; j < props->count_props; j++)
+                               dump_prop(props->props[j],
+                                         props->prop_values[j]);
+                       drmModeFreeObjectProperties(props);
+               } else {
+                       printf("\tcould not get plane properties: %s\n",
+                              strerror(errno));
+               }
+
+               drmModeFreePlane(ovr);
+       }
+       printf("\n");
+
+       drmModeFreePlaneResources(plane_resources);
+       return;
+}
+
+/* -----------------------------------------------------------------------------
+ * Connectors and planes
+ */
+
 /*
  * Mode setting with the kernel interfaces is a bit of a chore.
  * First you have to find the connector in question and make sure the
@@ -243,17 +483,33 @@ void dump_framebuffers(void)
  * can bind it with a free crtc.
  */
 struct connector {
-       int id;
+       uint32_t id;
        char mode_str[64];
-       struct drm_mode_modeinfo *mode;
+       char format_str[5];
+       unsigned int fourcc;
+       drmModeModeInfo *mode;
        drmModeEncoder *encoder;
-};     
+       int crtc;
+       int pipe;
+       unsigned int fb_id[2], current_fb_id;
+       struct timeval start;
+
+       int swap_count;
+};
+
+struct plane {
+       uint32_t con_id;  /* the id of connector to bind to */
+       uint32_t w, h;
+       unsigned int fb_id;
+       char format_str[5]; /* need to leave room for terminating \0 */
+       unsigned int fourcc;
+};
 
 static void
 connector_find_mode(struct connector *c)
 {
        drmModeConnector *connector;
-       int i, j, size, ret, width, height;
+       int i, j;
 
        /* First, find the connector & mode */
        c->mode = NULL;
@@ -311,19 +567,133 @@ connector_find_mode(struct connector *c)
 
                drmModeFreeEncoder(c->encoder);
        }
+
+       if (c->crtc == -1)
+               c->crtc = c->encoder->crtc_id;
+
+       /* and figure out which crtc index it is: */
+       for (i = 0; i < resources->count_crtcs; i++) {
+               if (c->crtc == resources->crtcs[i]) {
+                       c->pipe = i;
+                       break;
+               }
+       }
+
+}
+
+/* -------------------------------------------------------------------------- */
+
+void
+page_flip_handler(int fd, unsigned int frame,
+                 unsigned int sec, unsigned int usec, void *data)
+{
+       struct connector *c;
+       unsigned int new_fb_id;
+       struct timeval end;
+       double t;
+
+       c = data;
+       if (c->current_fb_id == c->fb_id[0])
+               new_fb_id = c->fb_id[1];
+       else
+               new_fb_id = c->fb_id[0];
+
+       drmModePageFlip(fd, c->crtc, new_fb_id,
+                       DRM_MODE_PAGE_FLIP_EVENT, c);
+       c->current_fb_id = new_fb_id;
+       c->swap_count++;
+       if (c->swap_count == 60) {
+               gettimeofday(&end, NULL);
+               t = end.tv_sec + end.tv_usec * 1e-6 -
+                       (c->start.tv_sec + c->start.tv_usec * 1e-6);
+               fprintf(stderr, "freq: %.02fHz\n", c->swap_count / t);
+               c->swap_count = 0;
+               c->start = end;
+       }
+}
+
+static int
+set_plane(struct kms_driver *kms, struct connector *c, struct plane *p)
+{
+       drmModePlaneRes *plane_resources;
+       drmModePlane *ovr;
+       uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */
+       uint32_t plane_id = 0;
+       struct kms_bo *plane_bo;
+       uint32_t plane_flags = 0;
+       int ret, crtc_x, crtc_y, crtc_w, crtc_h;
+       unsigned int i;
+
+       /* find an unused plane which can be connected to our crtc */
+       plane_resources = drmModeGetPlaneResources(fd);
+       if (!plane_resources) {
+               fprintf(stderr, "drmModeGetPlaneResources failed: %s\n",
+                       strerror(errno));
+               return -1;
+       }
+
+       for (i = 0; i < plane_resources->count_planes && !plane_id; i++) {
+               ovr = drmModeGetPlane(fd, plane_resources->planes[i]);
+               if (!ovr) {
+                       fprintf(stderr, "drmModeGetPlane failed: %s\n",
+                               strerror(errno));
+                       return -1;
+               }
+
+               if ((ovr->possible_crtcs & (1 << c->pipe)) && !ovr->crtc_id)
+                       plane_id = ovr->plane_id;
+
+               drmModeFreePlane(ovr);
+       }
+
+       fprintf(stderr, "testing %dx%d@%s overlay plane\n",
+                       p->w, p->h, p->format_str);
+
+       if (!plane_id) {
+               fprintf(stderr, "failed to find plane!\n");
+               return -1;
+       }
+
+       plane_bo = create_test_buffer(kms, p->fourcc, p->w, p->h, handles,
+                                     pitches, offsets, PATTERN_TILES);
+       if (plane_bo == NULL)
+               return -1;
+
+       /* just use single plane format for now.. */
+       if (drmModeAddFB2(fd, p->w, p->h, p->fourcc,
+                       handles, pitches, offsets, &p->fb_id, plane_flags)) {
+               fprintf(stderr, "failed to add fb: %s\n", strerror(errno));
+               return -1;
+       }
+
+       /* ok, boring.. but for now put in middle of screen: */
+       crtc_x = c->mode->hdisplay / 3;
+       crtc_y = c->mode->vdisplay / 3;
+       crtc_w = crtc_x;
+       crtc_h = crtc_y;
+
+       /* note src coords (last 4 args) are in Q16 format */
+       if (drmModeSetPlane(fd, plane_id, c->crtc, p->fb_id,
+                           plane_flags, crtc_x, crtc_y, crtc_w, crtc_h,
+                           0, 0, p->w << 16, p->h << 16)) {
+               fprintf(stderr, "failed to enable plane: %s\n",
+                       strerror(errno));
+               return -1;
+       }
+
+       return 0;
 }
 
 static void
-set_mode(struct connector *c, int count)
+set_mode(struct connector *c, int count, struct plane *p, int plane_count,
+               int page_flip)
 {
-       drmModeConnector *connector;
-       drmModeEncoder *encoder = NULL;
-       struct drm_mode_modeinfo *mode = NULL;
-       drm_intel_bufmgr *bufmgr;
-       drm_intel_bo *bo;
-       unsigned int fb_id, *fb_ptr;
-       int i, j, size, ret, width, height, x;
-       div_t d;
+       struct kms_driver *kms;
+       struct kms_bo *bo, *other_bo;
+       unsigned int fb_id, other_fb_id;
+       int i, j, ret, width, height, x;
+       uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */
+       drmEventContext evctx;
 
        width = 0;
        height = 0;
@@ -336,86 +706,243 @@ set_mode(struct connector *c, int count)
                        height = c[i].mode->vdisplay;
        }
 
-       bufmgr = drm_intel_bufmgr_gem_init(fd, 2<<20);
-       if (!bufmgr) {
-               fprintf(stderr, "failed to init bufmgr: %s\n", strerror(errno));
+       ret = kms_create(fd, &kms);
+       if (ret) {
+               fprintf(stderr, "failed to create kms driver: %s\n",
+                       strerror(-ret));
                return;
        }
 
-       /* Mode size at 32 bpp */
-       size = width * height * 4;
-
-       bo = drm_intel_bo_alloc(bufmgr, "frontbuffer", size, 4096);
-       if (!bo) {
-               fprintf(stderr, "failed to alloc buffer: %s\n",
-                       strerror(errno));
+       bo = create_test_buffer(kms, c->fourcc, width, height, handles,
+                               pitches, offsets, PATTERN_SMPTE);
+       if (bo == NULL)
                return;
-       }
 
-       ret = drm_intel_gem_bo_map_gtt(bo);
+       ret = drmModeAddFB2(fd, width, height, c->fourcc,
+                           handles, pitches, offsets, &fb_id, 0);
        if (ret) {
-               fprintf(stderr, "failed to GTT map buffer: %s\n",
-                       strerror(errno));
+               fprintf(stderr, "failed to add fb (%ux%u): %s\n",
+                       width, height, strerror(errno));
                return;
        }
 
-       fb_ptr = bo->virtual;
+       x = 0;
+       for (i = 0; i < count; i++) {
+               if (c[i].mode == NULL)
+                       continue;
+
+               printf("setting mode %s@%s on connector %d, crtc %d\n",
+                      c[i].mode_str, c[i].format_str, c[i].id, c[i].crtc);
 
-       /* paint the buffer with colored tiles */
-       for (i = 0; i < width * height; i++) {
-               d = div(i, width);
-               fb_ptr[i] = 0x00130502 * (d.quot >> 6) + 0x000a1120 * (d.rem >> 6);
+               ret = drmModeSetCrtc(fd, c[i].crtc, fb_id, x, 0,
+                                    &c[i].id, 1, c[i].mode);
+
+               /* XXX: Actually check if this is needed */
+               drmModeDirtyFB(fd, fb_id, NULL, 0);
+
+               x += c[i].mode->hdisplay;
+
+               if (ret) {
+                       fprintf(stderr, "failed to set mode: %s\n", strerror(errno));
+                       return;
+               }
+
+               /* if we have a plane/overlay to show, set that up now: */
+               for (j = 0; j < plane_count; j++)
+                       if (p[j].con_id == c[i].id)
+                               if (set_plane(kms, &c[i], &p[j]))
+                                       return;
        }
 
-       ret = drmModeAddFB(fd, width, height, 32, 32, width * 4, bo->handle,
-                          &fb_id);
+       if (!page_flip)
+               return;
+       
+       other_bo = create_test_buffer(kms, c->fourcc, width, height, handles,
+                                     pitches, offsets, PATTERN_PLAIN);
+       if (other_bo == NULL)
+               return;
+
+       ret = drmModeAddFB2(fd, width, height, c->fourcc, handles, pitches, offsets,
+                           &other_fb_id, 0);
        if (ret) {
                fprintf(stderr, "failed to add fb: %s\n", strerror(errno));
                return;
        }
 
-       x = 0;
        for (i = 0; i < count; i++) {
                if (c[i].mode == NULL)
                        continue;
-               ret = drmModeSetCrtc(fd, c[i].encoder->crtc_id, fb_id, x, 0,
-                                    &c[i].id, 1, c[i].mode);
-               x += c[i].mode->hdisplay;
 
+               ret = drmModePageFlip(fd, c[i].crtc, other_fb_id,
+                                     DRM_MODE_PAGE_FLIP_EVENT, &c[i]);
                if (ret) {
-                       fprintf(stderr, "failed to set mode: %s\n", strerror(errno));
+                       fprintf(stderr, "failed to page flip: %s\n", strerror(errno));
                        return;
                }
+               gettimeofday(&c[i].start, NULL);
+               c[i].swap_count = 0;
+               c[i].fb_id[0] = fb_id;
+               c[i].fb_id[1] = other_fb_id;
+               c[i].current_fb_id = other_fb_id;
+       }
+
+       memset(&evctx, 0, sizeof evctx);
+       evctx.version = DRM_EVENT_CONTEXT_VERSION;
+       evctx.vblank_handler = NULL;
+       evctx.page_flip_handler = page_flip_handler;
+       
+       while (1) {
+#if 0
+               struct pollfd pfd[2];
+
+               pfd[0].fd = 0;
+               pfd[0].events = POLLIN;
+               pfd[1].fd = fd;
+               pfd[1].events = POLLIN;
+
+               if (poll(pfd, 2, -1) < 0) {
+                       fprintf(stderr, "poll error\n");
+                       break;
+               }
+
+               if (pfd[0].revents)
+                       break;
+#else
+               struct timeval timeout = { .tv_sec = 3, .tv_usec = 0 };
+               fd_set fds;
+               int ret;
+
+               FD_ZERO(&fds);
+               FD_SET(0, &fds);
+               FD_SET(fd, &fds);
+               ret = select(fd + 1, &fds, NULL, NULL, &timeout);
+
+               if (ret <= 0) {
+                       fprintf(stderr, "select timed out or error (ret %d)\n",
+                               ret);
+                       continue;
+               } else if (FD_ISSET(0, &fds)) {
+                       break;
+               }
+#endif
+
+               drmHandleEvent(fd, &evctx);
        }
+
+       kms_bo_destroy(&bo);
+       kms_bo_destroy(&other_bo);
+       kms_destroy(&kms);
 }
 
 extern char *optarg;
 extern int optind, opterr, optopt;
-static char optstr[] = "ecpmfs:";
+static char optstr[] = "ecpmfs:P:v";
+
+#define min(a, b)      ((a) < (b) ? (a) : (b))
+
+static int parse_connector(struct connector *c, const char *arg)
+{
+       unsigned int len;
+       const char *p;
+       char *endp;
+
+       c->crtc = -1;
+       strcpy(c->format_str, "XR24");
+
+       c->id = strtoul(arg, &endp, 10);
+       if (*endp == '@') {
+               arg = endp + 1;
+               c->crtc = strtoul(arg, &endp, 10);
+       }
+       if (*endp != ':')
+               return -1;
+
+       arg = endp + 1;
+
+       p = strchrnul(arg, '@');
+       len = min(sizeof c->mode_str - 1, p - arg);
+       strncpy(c->mode_str, arg, len);
+       c->mode_str[len] = '\0';
+
+       if (*p == '@') {
+               strncpy(c->format_str, p + 1, 4);
+               c->format_str[4] = '\0';
+       }
+
+       c->fourcc = format_fourcc(c->format_str);
+       if (c->fourcc == 0)  {
+               fprintf(stderr, "unknown format %s\n", c->format_str);
+               return -1;
+       }
+
+       return 0;
+}
+
+static int parse_plane(struct plane *p, const char *arg)
+{
+       strcpy(p->format_str, "XR24");
+
+       if (sscanf(arg, "%d:%dx%d@%4s", &p->con_id, &p->w, &p->h, &p->format_str) != 4 &&
+           sscanf(arg, "%d:%dx%d", &p->con_id, &p->w, &p->h) != 3)
+               return -1;
+
+       p->fourcc = format_fourcc(p->format_str);
+       if (p->fourcc == 0) {
+               fprintf(stderr, "unknown format %s\n", p->format_str);
+               return -1;
+       }
+
+       return 0;
+}
 
 void usage(char *name)
 {
        fprintf(stderr, "usage: %s [-ecpmf]\n", name);
        fprintf(stderr, "\t-e\tlist encoders\n");
        fprintf(stderr, "\t-c\tlist connectors\n");
-       fprintf(stderr, "\t-p\tlist CRTCs (pipes)\n");
+       fprintf(stderr, "\t-p\tlist CRTCs and planes (pipes)\n");
        fprintf(stderr, "\t-m\tlist modes\n");
        fprintf(stderr, "\t-f\tlist framebuffers\n");
-       fprintf(stderr, "\t-s <connector_id>:<mode>\tset a mode\n");
+       fprintf(stderr, "\t-v\ttest vsynced page flipping\n");
+       fprintf(stderr, "\t-s <connector_id>[@<crtc_id>]:<mode>[@<format>]\tset a mode\n");
+       fprintf(stderr, "\t-P <connector_id>:<w>x<h>[@<format>]\tset a plane\n");
        fprintf(stderr, "\n\tDefault is to dump all info.\n");
        exit(0);
 }
 
 #define dump_resource(res) if (res) dump_##res()
 
+static int page_flipping_supported(void)
+{
+       /*FIXME: generic ioctl needed? */
+       return 1;
+#if 0
+       int ret, value;
+       struct drm_i915_getparam gp;
+
+       gp.param = I915_PARAM_HAS_PAGEFLIPPING;
+       gp.value = &value;
+
+       ret = drmCommandWriteRead(fd, DRM_I915_GETPARAM, &gp, sizeof(gp));
+       if (ret) {
+               fprintf(stderr, "drm_i915_getparam: %m\n");
+               return 0;
+       }
+
+       return *gp.value;
+#endif
+}
+
 int main(int argc, char **argv)
 {
        int c;
-       int encoders = 0, connectors = 0, crtcs = 0, framebuffers = 0;
-       char *modules[] = { "i915", "radeon" };
-       char *modeset = NULL, *mode, *connector;
-       int i, connector_id, count = 0;
+       int encoders = 0, connectors = 0, crtcs = 0, planes = 0, framebuffers = 0;
+       int test_vsync = 0;
+       char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos" };
+       unsigned int i;
+       int count = 0, plane_count = 0;
        struct connector con_args[2];
+       struct plane plane_args[2] = {0};
        
        opterr = 0;
        while ((c = getopt(argc, argv, optstr)) != -1) {
@@ -428,6 +955,7 @@ int main(int argc, char **argv)
                        break;
                case 'p':
                        crtcs = 1;
+                       planes = 1;
                        break;
                case 'm':
                        modes = 1;
@@ -435,17 +963,19 @@ int main(int argc, char **argv)
                case 'f':
                        framebuffers = 1;
                        break;
+               case 'v':
+                       test_vsync = 1;
+                       break;
                case 's':
-                       modeset = strdup(optarg);
-                       if (sscanf(optarg, "%d:%64s",
-                                  &con_args[count].id,
-                                  &con_args[count].mode_str) != 2)
+                       if (parse_connector(&con_args[count], optarg) < 0)
                                usage(argv[0]);
-                       printf("setting mode %s on connector %d\n",
-                              con_args[count].mode_str,
-                              con_args[count].id);
                        count++;                                      
                        break;
+               case 'P':
+                       if (parse_plane(&plane_args[plane_count], optarg) < 0)
+                               usage(argv[0]);
+                       plane_count++;
+                       break;
                default:
                        usage(argv[0]);
                        break;
@@ -453,7 +983,7 @@ int main(int argc, char **argv)
        }
 
        if (argc == 1)
-               encoders = connectors = crtcs = modes = framebuffers = 1;
+               encoders = connectors = crtcs = planes = modes = framebuffers = 1;
 
        for (i = 0; i < ARRAY_SIZE(modules); i++) {
                printf("trying to load module %s...", modules[i]);
@@ -466,6 +996,11 @@ int main(int argc, char **argv)
                }
        }
 
+       if (test_vsync && !page_flipping_supported()) {
+               fprintf(stderr, "page flipping not supported by drm.\n");
+               return -1;
+       }
+
        if (i == ARRAY_SIZE(modules)) {
                fprintf(stderr, "failed to load any modules, aborting.\n");
                return -1;
@@ -482,10 +1017,11 @@ int main(int argc, char **argv)
        dump_resource(encoders);
        dump_resource(connectors);
        dump_resource(crtcs);
+       dump_resource(planes);
        dump_resource(framebuffers);
 
        if (count > 0) {
-               set_mode(con_args, count);
+               set_mode(con_args, count, plane_args, plane_count, test_vsync);
                getchar();
        }