xf86-video-intel: configure.ac test/dri2-test.c test/.gitignore test/Makefile.am
Chris Wilson
ickle at kemper.freedesktop.org
Thu Sep 12 07:47:57 PDT 2013
configure.ac | 2
test/.gitignore | 3
test/Makefile.am | 3
test/dri2-test.c | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 240 insertions(+), 2 deletions(-)
New commits:
commit 76790db4e6b33a439a6426ec73547904a50047c5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Sep 12 14:50:37 2013 +0100
test: Exercise flips/blit swaps on each pipe
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index 0a63121..04ae1fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,7 @@ if test "x$UDEV" != "xno"; then
fi
fi
-PKG_CHECK_MODULES(X11, [x11 xrender xext pixman-1], [x11="yes"], [x11="no"])
+PKG_CHECK_MODULES(X11, [x11 xrender xrandr xext pixman-1], [x11="yes"], [x11="no"])
AM_CONDITIONAL(HAVE_X11, test "x$x11" = "xyes")
PKG_CHECK_MODULES(TOOL, [xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1], [tools="yes"], [tools="no"])
diff --git a/test/.gitignore b/test/.gitignore
index 6576f55..7088578 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -15,3 +15,6 @@ render-copy-alphaless
mixed-stress
lowlevel-blt-bench
vsync.avi
+dri2-race
+dri2-swap
+dri2-test
diff --git a/test/Makefile.am b/test/Makefile.am
index 26d724a..2874588 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,8 +20,9 @@ stress_TESTS = \
if DRI2
stress_TESTS += \
- dri2-swap \
dri2-race \
+ dri2-swap \
+ dri2-test \
$(NULL)
endif
diff --git a/test/dri2-test.c b/test/dri2-test.c
new file mode 100644
index 0000000..f712f12
--- /dev/null
+++ b/test/dri2-test.c
@@ -0,0 +1,234 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/Xrandr.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <time.h>
+
+#include <xf86drm.h>
+#include <drm.h>
+
+#include "dri2.h"
+
+#define COUNT 60
+
+static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Window window)
+{
+ XRRScreenResources *res;
+
+ res = XRRGetScreenResourcesCurrent(dpy, window);
+ if (res == NULL)
+ res = XRRGetScreenResources(dpy, window);
+
+ return res;
+}
+
+static XRRModeInfo *lookup_mode(XRRScreenResources *res, int id)
+{
+ int i;
+
+ for (i = 0; i < res->nmode; i++) {
+ if (res->modes[i].id == id)
+ return &res->modes[i];
+ }
+
+ return NULL;
+}
+
+static int dri2_open(Display *dpy)
+{
+ drm_auth_t auth;
+ char *driver, *device;
+ int fd;
+
+ if (!DRI2Connect(dpy, DefaultRootWindow(dpy), &driver, &device))
+ return -1;
+
+ printf ("Connecting to %s driver on %s\n", driver, device);
+
+ fd = open("/dev/dri/card0", O_RDWR);
+ if (fd < 0)
+ return -1;
+
+ if (drmIoctl(fd, DRM_IOCTL_GET_MAGIC, &auth))
+ return -1;
+
+ if (!DRI2Authenticate(dpy, DefaultRootWindow(dpy), auth.magic))
+ return -1;
+
+ return fd;
+}
+
+static void dri2_copy_swap(Display *dpy, Drawable d,
+ int width, int height, int has_front)
+{
+ XRectangle rect;
+ XserverRegion region;
+
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = width;
+ rect.height = height;
+
+ region = XFixesCreateRegion(dpy, &rect, 1);
+ DRI2CopyRegion(dpy, d, region, DRI2BufferFrontLeft, DRI2BufferBackLeft);
+ if (has_front)
+ DRI2CopyRegion(dpy, d, region, DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft);
+ XFixesDestroyRegion(dpy, region);
+}
+
+static void xsync(Display *dpy, Window win)
+{
+ XImage *image;
+
+ image = XGetImage(dpy, win, 0, 0, 1, 1, ~0, ZPixmap);
+ if (image)
+ XDestroyImage(image);
+}
+
+static double elapsed(const struct timespec *start,
+ const struct timespec *end)
+{
+ return (end->tv_sec - start->tv_sec) +
+ 1e-9*(end->tv_nsec - start->tv_nsec);
+}
+
+static void run(Display *dpy, int width, int height,
+ unsigned int *attachments, int nattachments,
+ const char *name)
+{
+ Window win;
+ XSetWindowAttributes attr;
+ int count;
+ DRI2Buffer *buffers;
+ struct timespec start, end;
+
+ /* Be nasty and install a fullscreen window on top so that we
+ * can guarantee we do not get clipped by children.
+ */
+ attr.override_redirect = 1;
+ win = XCreateWindow(dpy, DefaultRootWindow(dpy),
+ 0, 0, width, height, 0,
+ DefaultDepth(dpy, DefaultScreen(dpy)),
+ InputOutput,
+ DefaultVisual(dpy, DefaultScreen(dpy)),
+ CWOverrideRedirect, &attr);
+ XMapWindow(dpy, win);
+ xsync(dpy, win);
+
+ DRI2CreateDrawable(dpy, win);
+
+ buffers = DRI2GetBuffers(dpy, win, &width, &height,
+ attachments, nattachments, &count);
+ if (count != nattachments)
+ return;
+
+ xsync(dpy, win);
+ clock_gettime(CLOCK_MONOTONIC, &start);
+ for (count = 0; count < COUNT; count++)
+ DRI2SwapBuffers(dpy, win, 0, 0, 0);
+ xsync(dpy, win);
+ clock_gettime(CLOCK_MONOTONIC, &end);
+ printf("%d %s (%dx%d) swaps in %fs.\n",
+ count, name, width, height, elapsed(&start, &end));
+
+ xsync(dpy, win);
+ clock_gettime(CLOCK_MONOTONIC, &start);
+ for (count = 0; count < COUNT; count++)
+ dri2_copy_swap(dpy, win, width, height, nattachments == 2);
+ xsync(dpy, win);
+ clock_gettime(CLOCK_MONOTONIC, &end);
+
+ printf("%d %s (%dx%d) blits in %fs.\n",
+ count, name, width, height, elapsed(&start, &end));
+
+ DRI2SwapInterval(dpy, win, 0);
+
+ xsync(dpy, win);
+ clock_gettime(CLOCK_MONOTONIC, &start);
+ for (count = 0; count < COUNT; count++)
+ DRI2SwapBuffers(dpy, win, 0, 0, 0);
+ xsync(dpy, win);
+ clock_gettime(CLOCK_MONOTONIC, &end);
+ printf("%d %s (%dx%d) vblank=0 swaps in %fs.\n",
+ count, name, width, height, elapsed(&start, &end));
+
+ XDestroyWindow(dpy, win);
+ free(buffers);
+
+ XSync(dpy, 1);
+}
+
+int main(void)
+{
+ Display *dpy;
+ int i, j, fd;
+ unsigned int attachments[] = {
+ DRI2BufferBackLeft,
+ DRI2BufferFrontLeft,
+ };
+ XRRScreenResources *res;
+
+ dpy = XOpenDisplay(NULL);
+ if (dpy == NULL)
+ return 77;
+
+ if (!XRRQueryVersion(dpy, &i, &j))
+ return 77;
+
+ fd = dri2_open(dpy);
+ if (fd < 0)
+ return 1;
+
+ res = _XRRGetScreenResourcesCurrent(dpy, DefaultRootWindow(dpy));
+ if (res == NULL)
+ return 1;
+
+ printf("noutput=%d, ncrtc=%d\n", res->noutput, res->ncrtc);
+
+ for (i = 0; i < res->ncrtc; i++)
+ XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
+ 0, 0, None, RR_Rotate_0, NULL, 0);
+ XSync(dpy, True);
+
+ for (i = 0; i < res->noutput; i++) {
+ XRROutputInfo *output;
+ XRRModeInfo *mode;
+
+ output = XRRGetOutputInfo(dpy, res, res->outputs[i]);
+ if (output == NULL)
+ continue;
+
+ mode = NULL;
+ if (res->nmode)
+ mode = lookup_mode(res, output->modes[0]);
+
+ for (j = 0; mode && j < output->ncrtc; j++) {
+ printf("[%d, %d] -- OUTPUT:%ld, CRTC:%ld\n",
+ i, j, (long)res->outputs[i], (long)output->crtcs[j]);
+ XRRSetCrtcConfig(dpy, res, output->crtcs[j], CurrentTime,
+ 0, 0, output->modes[0], RR_Rotate_0, &res->outputs[i], 1);
+ XSync(dpy, True);
+
+ run(dpy, mode->width, mode->height, attachments, 1, "fullscreen");
+ run(dpy, mode->width, mode->height, attachments, 2, "fullscreen (with front)");
+
+ run(dpy, mode->width/2, mode->height/2, attachments, 1, "windowed");
+ run(dpy, mode->width/2, mode->height/2, attachments, 2, "windowed (with front)");
+
+ XRRSetCrtcConfig(dpy, res, output->crtcs[j], CurrentTime,
+ 0, 0, None, RR_Rotate_0, NULL, 0);
+ XSync(dpy, True);
+ }
+
+ XRRFreeOutputInfo(output);
+ }
+
+ return 0;
+}
More information about the xorg-commit
mailing list