diff mbox

[i-g-t,3/3] tests: add kms_3d test

Message ID 1408532049-9215-3-git-send-email-thomas.wood@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Wood Aug. 20, 2014, 10:54 a.m. UTC 
Add a test to verify creation and use of 3D stereo modes.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 lib/igt_fb.c           |   4 +-
 tests/.gitignore       |   1 +
 tests/Android.mk       |   1 +
 tests/Makefile.sources |   1 +
 tests/kms_3d.c         | 118 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 tests/kms_3d.c

Comments

Lespiau, Damien Aug. 26, 2014, 1:38 p.m. UTC | #1 
On Wed, Aug 20, 2014 at 11:54:09AM +0100, Thomas Wood wrote:
> Add a test to verify creation and use of 3D stereo modes.
> 
> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
> ---
>  lib/igt_fb.c           |   4 +-
>  tests/.gitignore       |   1 +
>  tests/Android.mk       |   1 +
>  tests/Makefile.sources |   1 +
>  tests/kms_3d.c         | 118 +++++++++++++++++++++++++++++++++++++++++++++++++
>  5 files changed, 123 insertions(+), 2 deletions(-)
>  create mode 100644 tests/kms_3d.c
> 
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index 9a13969..0096836 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -614,10 +614,10 @@ unsigned int igt_create_stereo_fb(int drm_fd, drmModeModeInfo *mode)
>  				  enable_tiling, &fb);
>  	cr = igt_get_cairo_ctx(drm_fd, &fb);
>  
> -	igt_paint_image(cr, IGT_DATADIR"1080p-left.png",
> +	igt_paint_image(cr, IGT_DATADIR"/1080p-left.png",
>  			    layout.left.x, layout.left.y,
>  			    layout.left.width, layout.left.height);
> -	igt_paint_image(cr, IGT_DATADIR"1080p-right.png",
> +	igt_paint_image(cr, IGT_DATADIR"/1080p-right.png",
>  			    layout.right.x, layout.right.y,
>  			    layout.right.width, layout.right.height);

I guess this hunk really belongs to the previous commit, but for i-g-t,
whatever really.

>  
> diff --git a/tests/.gitignore b/tests/.gitignore
> index 3da061e..9b5cf7d 100644
> --- a/tests/.gitignore
> +++ b/tests/.gitignore
> @@ -116,6 +116,7 @@ igt_no_exit
>  igt_no_exit_list_only
>  igt_no_subtest
>  igt_simulation
> +kms_3d
>  kms_addfb
>  kms_cursor_crc
>  kms_fbc_crc
> diff --git a/tests/Android.mk b/tests/Android.mk
> index 3644aa1..f28b400 100644
> --- a/tests/Android.mk
> +++ b/tests/Android.mk
> @@ -55,6 +55,7 @@ ifeq ("${ANDROID_HAS_CAIRO}", "1")
>  else
>  # the following tests depend on cairo, so skip them
>      skip_tests_list += \
> +    kms_3d \
>      kms_plane \
>      kms_addfb \
>      kms_cursor_crc \
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 698e290..078df57 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -141,6 +141,7 @@ TESTS_progs = \
>  	gen3_render_tiledx_blits \
>  	gen3_render_tiledy_blits \
>  	gen7_forcewake_mt \
> +	kms_3d \
>  	kms_force_connector \
>  	kms_sink_crc_basic \
>  	kms_fence_pin_leak \
> diff --git a/tests/kms_3d.c b/tests/kms_3d.c
> new file mode 100644
> index 0000000..c593f34
> --- /dev/null
> +++ b/tests/kms_3d.c
> @@ -0,0 +1,118 @@
> +/*
> + * Copyright © 2014 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include "igt_core.h"
> +#include "igt_kms.h"
> +#include "drmtest.h"
> +#include "igt_edid.h"
> +
> +igt_simple_main
> +{
> +	int drm_fd;
> +	drmModeRes *res;
> +	drmModeConnector *connector;
> +	unsigned char *edid;
> +	size_t length;
> +	int mode_count, connector_id;
> +
> +	drm_fd = drm_open_any();
> +	res = drmModeGetResources(drm_fd);
> +
> +	igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_STEREO_3D, 1) >= 0);
> +
> +	/* find an hdmi connector */
> +	for (int i = 0; i < res->count_connectors; i++) {
> +
> +		connector = drmModeGetConnector(drm_fd, res->connectors[i]);
> +
> +		if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA &&
> +		    connector->connection == DRM_MODE_DISCONNECTED)
> +			break;
> +
> +		drmModeFreeConnector(connector);
> +
> +		connector = NULL;
> +	}
> +	igt_require(connector);
> +
> +	kmstest_edid_add_3d(generic_edid[EDID_FHD], EDID_LENGTH, &edid,
> +			    &length);
> +
> +	kmstest_force_edid(drm_fd, connector, edid, length);
> +	kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_ON);
> +
> +	connector_id = connector->connector_id;
> +
> +	/* check for 3D modes */
> +	mode_count = 0;
> +	connector = drmModeGetConnector(drm_fd, connector_id);
> +	for (int i = 0; i < connector->count_modes; i++) {
> +		if (connector->modes[i].flags & DRM_MODE_FLAG_3D_MASK)
> +			mode_count++;
> +	}
> +
> +	igt_assert(mode_count == 13);
> +
> +	/* set 3D modes */
> +	igt_info("Testing:\n");
> +	for (int i = 0; i < connector->count_modes; i++) {
> +		int fb_id;
> +		struct kmstest_connector_config config;
> +		int crtc_mask = -1;
> +		int ret;
> +
> +		if (!(connector->modes[i].flags & DRM_MODE_FLAG_3D_MASK))
> +			continue;
> +
> +		/* create a configuration */
> +		ret = kmstest_get_connector_config(drm_fd, connector_id,
> +						   crtc_mask, &config);
> +		if (ret != true) {
> +			igt_info("Error creating configuration for:\n  ");
> +			kmstest_dump_mode(&connector->modes[i]);
> +
> +			continue;
> +		}
> +
> +		igt_info("  ");
> +		kmstest_dump_mode(&connector->modes[i]);
> +
> +		/* create stereo framebuffer */
> +		fb_id = igt_create_stereo_fb(drm_fd, &connector->modes[i]);
> +
> +		ret = drmModeSetCrtc(drm_fd, config.crtc->crtc_id, fb_id, 0, 0,
> +				     &connector->connector_id, 1,
> +				     &connector->modes[i]);
> +
> +		igt_assert(ret == 0);
> +	}
> +
> +	kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_UNSPECIFIED);
> +	kmstest_force_edid(drm_fd, connector, NULL, 0);
> +
> +	drmModeFreeConnector(connector);
> +	free(edid);
> +
> +	igt_exit();
> +}
> -- 
> 1.9.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 9a13969..0096836 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -614,10 +614,10 @@  unsigned int igt_create_stereo_fb(int drm_fd, drmModeModeInfo *mode)
 				  enable_tiling, &fb);
 	cr = igt_get_cairo_ctx(drm_fd, &fb);
 
-	igt_paint_image(cr, IGT_DATADIR"1080p-left.png",
+	igt_paint_image(cr, IGT_DATADIR"/1080p-left.png",
 			    layout.left.x, layout.left.y,
 			    layout.left.width, layout.left.height);
-	igt_paint_image(cr, IGT_DATADIR"1080p-right.png",
+	igt_paint_image(cr, IGT_DATADIR"/1080p-right.png",
 			    layout.right.x, layout.right.y,
 			    layout.right.width, layout.right.height);
 
diff --git a/tests/.gitignore b/tests/.gitignore
index 3da061e..9b5cf7d 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -116,6 +116,7 @@  igt_no_exit
 igt_no_exit_list_only
 igt_no_subtest
 igt_simulation
+kms_3d
 kms_addfb
 kms_cursor_crc
 kms_fbc_crc
diff --git a/tests/Android.mk b/tests/Android.mk
index 3644aa1..f28b400 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -55,6 +55,7 @@  ifeq ("${ANDROID_HAS_CAIRO}", "1")
 else
 # the following tests depend on cairo, so skip them
     skip_tests_list += \
+    kms_3d \
     kms_plane \
     kms_addfb \
     kms_cursor_crc \
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 698e290..078df57 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -141,6 +141,7 @@  TESTS_progs = \
 	gen3_render_tiledx_blits \
 	gen3_render_tiledy_blits \
 	gen7_forcewake_mt \
+	kms_3d \
 	kms_force_connector \
 	kms_sink_crc_basic \
 	kms_fence_pin_leak \
diff --git a/tests/kms_3d.c b/tests/kms_3d.c
new file mode 100644
index 0000000..c593f34
--- /dev/null
+++ b/tests/kms_3d.c
@@ -0,0 +1,118 @@ 
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include "igt_core.h"
+#include "igt_kms.h"
+#include "drmtest.h"
+#include "igt_edid.h"
+
+igt_simple_main
+{
+	int drm_fd;
+	drmModeRes *res;
+	drmModeConnector *connector;
+	unsigned char *edid;
+	size_t length;
+	int mode_count, connector_id;
+
+	drm_fd = drm_open_any();
+	res = drmModeGetResources(drm_fd);
+
+	igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_STEREO_3D, 1) >= 0);
+
+	/* find an hdmi connector */
+	for (int i = 0; i < res->count_connectors; i++) {
+
+		connector = drmModeGetConnector(drm_fd, res->connectors[i]);
+
+		if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA &&
+		    connector->connection == DRM_MODE_DISCONNECTED)
+			break;
+
+		drmModeFreeConnector(connector);
+
+		connector = NULL;
+	}
+	igt_require(connector);
+
+	kmstest_edid_add_3d(generic_edid[EDID_FHD], EDID_LENGTH, &edid,
+			    &length);
+
+	kmstest_force_edid(drm_fd, connector, edid, length);
+	kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_ON);
+
+	connector_id = connector->connector_id;
+
+	/* check for 3D modes */
+	mode_count = 0;
+	connector = drmModeGetConnector(drm_fd, connector_id);
+	for (int i = 0; i < connector->count_modes; i++) {
+		if (connector->modes[i].flags & DRM_MODE_FLAG_3D_MASK)
+			mode_count++;
+	}
+
+	igt_assert(mode_count == 13);
+
+	/* set 3D modes */
+	igt_info("Testing:\n");
+	for (int i = 0; i < connector->count_modes; i++) {
+		int fb_id;
+		struct kmstest_connector_config config;
+		int crtc_mask = -1;
+		int ret;
+
+		if (!(connector->modes[i].flags & DRM_MODE_FLAG_3D_MASK))
+			continue;
+
+		/* create a configuration */
+		ret = kmstest_get_connector_config(drm_fd, connector_id,
+						   crtc_mask, &config);
+		if (ret != true) {
+			igt_info("Error creating configuration for:\n  ");
+			kmstest_dump_mode(&connector->modes[i]);
+
+			continue;
+		}
+
+		igt_info("  ");
+		kmstest_dump_mode(&connector->modes[i]);
+
+		/* create stereo framebuffer */
+		fb_id = igt_create_stereo_fb(drm_fd, &connector->modes[i]);
+
+		ret = drmModeSetCrtc(drm_fd, config.crtc->crtc_id, fb_id, 0, 0,
+				     &connector->connector_id, 1,
+				     &connector->modes[i]);
+
+		igt_assert(ret == 0);
+	}
+
+	kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_UNSPECIFIED);
+	kmstest_force_edid(drm_fd, connector, NULL, 0);
+
+	drmModeFreeConnector(connector);
+	free(edid);
+
+	igt_exit();
+}