From 17787f30c6f05edb40da1a1fc0074bee2e09e779 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 22 May 2012 16:15:15 +0200
Subject: [PATCH] lib: extract kmstest_dump_mode

---
 demos/intel_sprite_on.c |  2 --
 lib/drmtest.c           | 21 +++++++++++++++++++--
 lib/drmtest.h           |  2 ++
 tests/flip_test.c       | 22 +---------------------
 tests/testdisplay.c     | 27 +++------------------------
 5 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/demos/intel_sprite_on.c b/demos/intel_sprite_on.c
index 6904858..c1d0224 100644
--- a/demos/intel_sprite_on.c
+++ b/demos/intel_sprite_on.c
@@ -41,8 +41,6 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 
-#include "xf86drm.h"
-#include "xf86drmMode.h"
 #include "i915_drm.h"
 #include "drmtest.h"
 
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 3d34869..f9f10e1 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -37,8 +37,6 @@
 #include <pciaccess.h>
 #include <math.h>
 
-#include "xf86drmMode.h"
-
 #include "drmtest.h"
 #include "i915_drm.h"
 #include "intel_chipset.h"
@@ -719,3 +717,22 @@ unsigned int kmstest_create_fb(int fd, int width, int height, int bpp,
 
 	return fb_id;
 }
+
+void kmstest_dump_mode(drmModeModeInfo *mode)
+{
+	printf("  %s %d %d %d %d %d %d %d %d %d 0x%x 0x%x %d\n",
+	       mode->name,
+	       mode->vrefresh,
+	       mode->hdisplay,
+	       mode->hsync_start,
+	       mode->hsync_end,
+	       mode->htotal,
+	       mode->vdisplay,
+	       mode->vsync_start,
+	       mode->vsync_end,
+	       mode->vtotal,
+	       mode->flags,
+	       mode->type,
+	       mode->clock);
+}
+
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 36f2825..9f27e2c 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -34,6 +34,7 @@
 #include <cairo.h>
 
 #include "xf86drm.h"
+#include "xf86drmMode.h"
 #include "intel_batchbuffer.h"
 
 int drm_get_card(int master);
@@ -90,6 +91,7 @@ unsigned int kmstest_create_fb(int fd, int width, int height, int bpp,
 			       struct kmstest_fb *fb_info,
 			       kmstest_paint_func paint_func,
 			       void *func_arg);
+void kmstest_dump_mode(drmModeModeInfo *mode);
 
 inline static void _do_or_die(const char *function, int line, int ret)
 {
diff --git a/tests/flip_test.c b/tests/flip_test.c
index 9b843fc..02b9634 100644
--- a/tests/flip_test.c
+++ b/tests/flip_test.c
@@ -34,8 +34,6 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 
-#include "xf86drm.h"
-#include "xf86drmMode.h"
 #include "i915_drm.h"
 #include "drmtest.h"
 #include "testdisplay.h"
@@ -65,24 +63,6 @@ struct test_output {
 	unsigned int fb_ids[2];
 };
 
-static void dump_mode(drmModeModeInfo *mode)
-{
-	printf("  %s %d %d %d %d %d %d %d %d %d 0x%x 0x%x %d\n",
-	       mode->name,
-	       mode->vrefresh,
-	       mode->hdisplay,
-	       mode->hsync_start,
-	       mode->hsync_end,
-	       mode->htotal,
-	       mode->vdisplay,
-	       mode->vsync_start,
-	       mode->vsync_end,
-	       mode->vtotal,
-	       mode->flags,
-	       mode->type,
-	       mode->clock);
-}
-
 static void page_flip_handler(int fd, unsigned int frame, unsigned int sec,
 			      unsigned int usec, void *data)
 {
@@ -243,7 +223,7 @@ static void set_mode(struct test_output *o, int crtc)
 	gem_close(drm_fd, fb_info[0].gem_handle);
 	gem_close(drm_fd, fb_info[1].gem_handle);
 
-	dump_mode(&o->mode);
+	kmstest_dump_mode(&o->mode);
 	if (drmModeSetCrtc(drm_fd, o->crtc, o->fb_ids[0], 0, 0,
 			   &o->id, 1, &o->mode)) {
 		fprintf(stderr, "failed to set mode (%dx%d@%dHz): %s\n",
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 5e415e3..dc087f8 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -58,8 +58,6 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 
-#include "xf86drm.h"
-#include "xf86drmMode.h"
 #include "i915_drm.h"
 #include "drmtest.h"
 #include "testdisplay.h"
@@ -153,25 +151,6 @@ struct connector {
 	int pipe;
 };
 
-static void dump_mode(drmModeModeInfo *mode)
-{
-	printf("  %s %d %d %d %d %d %d %d %d %d 0x%x 0x%x %d\n",
-	       mode->name,
-	       mode->vrefresh,
-	       mode->hdisplay,
-	       mode->hsync_start,
-	       mode->hsync_end,
-	       mode->htotal,
-	       mode->vdisplay,
-	       mode->vsync_start,
-	       mode->vsync_end,
-	       mode->vtotal,
-	       mode->flags,
-	       mode->type,
-	       mode->clock);
-}
-
-
 static void dump_connectors_fd(int drmfd)
 {
 	int i, j;
@@ -211,7 +190,7 @@ static void dump_connectors_fd(int drmfd)
 		printf("  name refresh (Hz) hdisp hss hse htot vdisp "
 		       "vss vse vtot flags type clock\n");
 		for (j = 0; j < connector->count_modes; j++)
-			dump_mode(&connector->modes[j]);
+			kmstest_dump_mode(&connector->modes[j]);
 
 		drmModeFreeConnector(connector);
 	}
@@ -241,7 +220,7 @@ static void dump_crtcs_fd(int drmfd)
 		       crtc->buffer_id,
 		       crtc->x, crtc->y,
 		       crtc->width, crtc->height);
-		dump_mode(&crtc->mode);
+		kmstest_dump_mode(&crtc->mode);
 
 		drmModeFreeCrtc(crtc);
 	}
@@ -492,7 +471,7 @@ set_mode(struct connector *c)
 		gem_close(drm_fd, fb_info.gem_handle);
 
 		fprintf(stdout, "CRTS(%u):",c->crtc);
-		dump_mode(&c->mode);
+		kmstest_dump_mode(&c->mode);
 		if (drmModeSetCrtc(drm_fd, c->crtc, fb_id, 0, 0,
 				   &c->id, 1, &c->mode)) {
 			fprintf(stderr, "failed to set mode (%dx%d@%dHz): %s\n",
-- 
2.7.4