From: Damien Lespiau <damien.lespiau@intel.com>
Date: Thu, 26 Sep 2013 16:56:01 +0000 (+0100)
Subject: testdisplay: Use DRM_MODE_FLAG_3D_MASK
X-Git-Tag: intel-gpu-tools-1.5~142
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7d1937cd777e23bb6f234156e6164aafe151fbe;p=profile%2Fextras%2Fintel-gpu-tools.git

testdisplay: Use DRM_MODE_FLAG_3D_MASK

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 5ff9b5f..e714e0c 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -1784,7 +1784,7 @@ type_name_fn(connector_type)
 
 void kmstest_dump_mode(drmModeModeInfo *mode)
 {
-	bool stereo_3d = mode->flags & DRMTEST_MODE_FLAG_3D_MASK;
+	bool stereo_3d = mode->flags & DRM_MODE_FLAG_3D_MASK;
 	char flags_str[32];
 
 #define PRINT_S(name) "%s"
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 296c500..6495800 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -288,15 +288,6 @@ bool igt_run_in_simulation(void);
  */
 void igt_skip_on_simulation(void);
 
-#define DRMTEST_MODE_FLAG_3D_MASK   (DRM_MODE_FLAG_3D_FRAME_PACKING         | \
-				     DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE     | \
-				     DRM_MODE_FLAG_3D_LINE_ALTERNATIVE      | \
-				     DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL     | \
-				     DRM_MODE_FLAG_3D_L_DEPTH               | \
-				     DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH | \
-				     DRM_MODE_FLAG_3D_TOP_AND_BOTTOM        | \
-				     DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF)
-
 /* helpers based upon the libdrm buffer manager */
 void igt_init_aperture_trashers(drm_intel_bufmgr *bufmgr);
 void igt_trash_aperture(void);
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 14469f8..e335cca 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -366,7 +366,8 @@ set_mode(struct connector *c)
 			c->mode = c->connector->modes[j];
 
 		/* set_mode() only tests 2D modes */
-		c->mode.flags &= ~DRMTEST_MODE_FLAG_3D_MASK;
+		if (c->mode.flags & DRM_MODE_FLAG_3D_MASK)
+			continue;
 
 		if (!c->mode_valid)
 			continue;
@@ -436,7 +437,7 @@ static void box_print(const char * prefix, struct box *box)
 static void stereo_fb_layout_from_mode(struct stereo_fb_layout *layout,
 				       drmModeModeInfo *mode)
 {
-	unsigned int format = mode->flags & DRMTEST_MODE_FLAG_3D_MASK;
+	unsigned int format = mode->flags & DRM_MODE_FLAG_3D_MASK;
 	const int hdisplay = mode->hdisplay, vdisplay = mode->vdisplay;
 	int middle;
 
@@ -479,7 +480,7 @@ static void stereo_fb_layout_from_mode(struct stereo_fb_layout *layout,
 
 static const char *stereo_mode_str(drmModeModeInfo *mode)
 {
-	unsigned int layout = mode->flags & DRMTEST_MODE_FLAG_3D_MASK;
+	unsigned int layout = mode->flags & DRM_MODE_FLAG_3D_MASK;
 
 	switch (layout) {
 	case DRM_MODE_FLAG_3D_TOP_AND_BOTTOM:
@@ -554,7 +555,7 @@ set_stereo_mode(struct connector *c)
 		if (!c->mode_valid)
 			continue;
 
-		if (!(c->mode.flags & DRMTEST_MODE_FLAG_3D_MASK))
+		if (!(c->mode.flags & DRM_MODE_FLAG_3D_MASK))
 			continue;
 
 		do_set_stereo_mode(c);