[PATCH i-g-t 1/2] CONTRIBUTING: Fix spelling mistake and line length

[PATCH i-g-t 1/2] CONTRIBUTING: Fix spelling mistake and line length

[Sean Paul]

Noticed while I was reading it. Makes for a good first contribution, I
guess.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 CONTRIBUTING | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 561c5dd8..ca2ed8a5 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -18,13 +18,13 @@ A short list of contribution guidelines:
 
   on its first invocation.
 
-- intel-gpu-tools is MIT lincensed and we require contributions to follow the
+- intel-gpu-tools is MIT licensed and we require contributions to follow the
   developer's certificate of origin: http://developercertificate.org/
 
 - When submitting new testcases please follow the naming conventions documented
-  in the generated documentation. Also please make full use of all the helpers and
-  convenience macros provided by the igt library. The semantic patch lib/igt.cocci
-  can help with the more automatic conversions.
+  in the generated documentation. Also please make full use of all the helpers
+  and convenience macros provided by the igt library. The semantic patch
+  lib/igt.cocci can help with the more automatic conversions.
 
 - Patches need to be reviewed on the mailing list. Exceptions only apply for
   testcases and tooling for drivers with just a single contributor (e.g. vc4).
-- 
2.15.0.531.g2ccb3012c9-goog

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 2/2] kms_content_protection: Add Content Protection test

[Sean Paul]

Pretty simple test:
- initializes the output
- clears the content protection property
- verifies that it clears
- sets the content protection property to desired
- verifies that it transitions to enabled

Does this for both legacy and atomic.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 lib/igt_kms.c                  |   3 +-
 lib/igt_kms.h                  |   1 +
 tests/Makefile.sources         |   1 +
 tests/kms_content_protection.c | 128 +++++++++++++++++++++++++++++++++++++++++
 tests/meson.build              |   1 +
 5 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 tests/kms_content_protection.c

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 125ecb19..907db694 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -190,7 +190,8 @@ const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
 	"scaling mode",
 	"CRTC_ID",
 	"DPMS",
-	"Broadcast RGB"
+	"Broadcast RGB",
+	"Content Protection"
 };
 
 /*
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 2a480bf3..93e59dc7 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -118,6 +118,7 @@ enum igt_atomic_connector_properties {
        IGT_CONNECTOR_CRTC_ID,
        IGT_CONNECTOR_DPMS,
        IGT_CONNECTOR_BROADCAST_RGB,
+       IGT_CONNECTOR_CONTENT_PROTECTION,
        IGT_NUM_CONNECTOR_PROPS
 };
 
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 34ca71a0..e0466411 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -179,6 +179,7 @@ TESTS_progs = \
 	kms_chv_cursor_fail \
 	kms_color \
 	kms_concurrent \
+	kms_content_protection\
 	kms_crtc_background_color \
 	kms_cursor_crc \
 	kms_cursor_legacy \
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
new file mode 100644
index 00000000..7bfe9a69
--- /dev/null
+++ b/tests/kms_content_protection.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright © 2017 Google, Inc.
+ *
+ * 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.h"
+
+IGT_TEST_DESCRIPTION("Test content protection (HDCP)");
+
+typedef struct {
+	int drm_fd;
+	igt_display_t display;
+} data_t;
+
+static bool
+wait_for_prop_value(igt_output_t *output, uint64_t expected)
+{
+	uint64_t val;
+	int i;
+
+	for (i = 0; i < 2000; i++) {
+		val = igt_output_get_prop(output,
+					  IGT_CONNECTOR_CONTENT_PROTECTION);
+		if (val == expected)
+			return true;
+		usleep(1000);
+	}
+	igt_info("prop_value mismatch %ld != %ld\n", val, expected);
+	return false;
+}
+
+static void
+test_pipe_output(igt_display_t *display, const enum pipe pipe,
+		 igt_output_t *output, enum igt_commit_style s)
+{
+	drmModeModeInfo mode;
+	igt_plane_t *primary;
+	struct igt_fb red;
+	bool ret;
+
+	igt_assert(kmstest_get_connector_default_mode(
+			display->drm_fd, output->config.connector, &mode));
+
+	igt_output_override_mode(output, &mode);
+	igt_output_set_pipe(output, pipe);
+
+	igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
+			    DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
+			    1.f, 0.f, 0.f, &red);
+	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
+	igt_plane_set_fb(primary, &red);
+	igt_display_commit2(display, s);
+
+	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
+	igt_display_commit2(display, s);
+
+	ret = wait_for_prop_value(output, 0);
+	igt_require_f(ret, "Content Protection not cleared\n");
+
+	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 1);
+	igt_display_commit2(display, s);
+
+	ret = wait_for_prop_value(output, 2);
+	igt_require_f(ret, "Content Protection not enabled\n");
+
+	igt_plane_set_fb(primary, NULL);
+	igt_output_set_pipe(output, PIPE_NONE);
+}
+
+static void
+test_content_protection(igt_display_t *display, enum igt_commit_style s)
+{
+	igt_output_t *output;
+	enum pipe pipe;
+
+	for_each_pipe_with_valid_output(display, pipe, output) {
+		if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
+			continue;
+
+		test_pipe_output(display, pipe, output, s);
+	}
+}
+
+igt_main
+{
+	data_t data = {};
+
+	igt_fixture {
+		igt_skip_on_simulation();
+
+		data.drm_fd = drm_open_driver(DRIVER_ANY);
+
+		igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);
+
+		igt_display_init(&data.display, data.drm_fd);
+	}
+
+
+	igt_subtest("legacy")
+		test_content_protection(&data.display, COMMIT_LEGACY);
+
+	igt_subtest("atomic") {
+		igt_require(data.display.is_atomic);
+		test_content_protection(&data.display, COMMIT_ATOMIC);
+	}
+
+	igt_fixture
+		igt_display_fini(&data.display);
+}
diff --git a/tests/meson.build b/tests/meson.build
index 59ccd9a6..b12c35c0 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -157,6 +157,7 @@ test_progs = [
 	'kms_chv_cursor_fail',
 	'kms_color',
 	'kms_concurrent',
+	'kms_content_protection',
 	'kms_crtc_background_color',
 	'kms_cursor_crc',
 	'kms_cursor_legacy',
-- 
2.15.0.531.g2ccb3012c9-goog

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/2] kms_content_protection: Add Content Protection test

[Petri Latvala]

On Tue, Dec 05, 2017 at 12:23:33AM -0500, Sean Paul wrote:
> Pretty simple test:
> - initializes the output
> - clears the content protection property
> - verifies that it clears
> - sets the content protection property to desired
> - verifies that it transitions to enabled
> 
> Does this for both legacy and atomic.
> 
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
>  lib/igt_kms.c                  |   3 +-
>  lib/igt_kms.h                  |   1 +
>  tests/Makefile.sources         |   1 +
>  tests/kms_content_protection.c | 128 +++++++++++++++++++++++++++++++++++++++++
>  tests/meson.build              |   1 +
>  5 files changed, 133 insertions(+), 1 deletion(-)
>  create mode 100644 tests/kms_content_protection.c
> 
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 125ecb19..907db694 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -190,7 +190,8 @@ const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
>  	"scaling mode",
>  	"CRTC_ID",
>  	"DPMS",
> -	"Broadcast RGB"
> +	"Broadcast RGB",
> +	"Content Protection"
>  };
>  
>  /*
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 2a480bf3..93e59dc7 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -118,6 +118,7 @@ enum igt_atomic_connector_properties {
>         IGT_CONNECTOR_CRTC_ID,
>         IGT_CONNECTOR_DPMS,
>         IGT_CONNECTOR_BROADCAST_RGB,
> +       IGT_CONNECTOR_CONTENT_PROTECTION,
>         IGT_NUM_CONNECTOR_PROPS
>  };
>  
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 34ca71a0..e0466411 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -179,6 +179,7 @@ TESTS_progs = \
>  	kms_chv_cursor_fail \
>  	kms_color \
>  	kms_concurrent \
> +	kms_content_protection\
>  	kms_crtc_background_color \
>  	kms_cursor_crc \
>  	kms_cursor_legacy \
> diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
> new file mode 100644
> index 00000000..7bfe9a69
> --- /dev/null
> +++ b/tests/kms_content_protection.c
> @@ -0,0 +1,128 @@
> +/*
> + * Copyright © 2017 Google, Inc.
> + *
> + * 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.h"
> +
> +IGT_TEST_DESCRIPTION("Test content protection (HDCP)");
> +
> +typedef struct {
> +	int drm_fd;
> +	igt_display_t display;
> +} data_t;
> +
> +static bool
> +wait_for_prop_value(igt_output_t *output, uint64_t expected)
> +{
> +	uint64_t val;
> +	int i;
> +
> +	for (i = 0; i < 2000; i++) {
> +		val = igt_output_get_prop(output,
> +					  IGT_CONNECTOR_CONTENT_PROTECTION);
> +		if (val == expected)
> +			return true;
> +		usleep(1000);
> +	}
> +	igt_info("prop_value mismatch %ld != %ld\n", val, expected);
> +	return false;
> +}
> +
> +static void
> +test_pipe_output(igt_display_t *display, const enum pipe pipe,
> +		 igt_output_t *output, enum igt_commit_style s)
> +{
> +	drmModeModeInfo mode;
> +	igt_plane_t *primary;
> +	struct igt_fb red;
> +	bool ret;
> +
> +	igt_assert(kmstest_get_connector_default_mode(
> +			display->drm_fd, output->config.connector, &mode));
> +
> +	igt_output_override_mode(output, &mode);
> +	igt_output_set_pipe(output, pipe);
> +
> +	igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
> +			    DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
> +			    1.f, 0.f, 0.f, &red);
> +	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> +	igt_plane_set_fb(primary, &red);
> +	igt_display_commit2(display, s);
> +
> +	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
> +	igt_display_commit2(display, s);
> +
> +	ret = wait_for_prop_value(output, 0);
> +	igt_require_f(ret, "Content Protection not cleared\n");
> +
> +	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 1);
> +	igt_display_commit2(display, s);
> +
> +	ret = wait_for_prop_value(output, 2);
> +	igt_require_f(ret, "Content Protection not enabled\n");
> +
> +	igt_plane_set_fb(primary, NULL);
> +	igt_output_set_pipe(output, PIPE_NONE);
> +}
> +
> +static void
> +test_content_protection(igt_display_t *display, enum igt_commit_style s)
> +{
> +	igt_output_t *output;
> +	enum pipe pipe;
> +
> +	for_each_pipe_with_valid_output(display, pipe, output) {
> +		if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
> +			continue;
> +
> +		test_pipe_output(display, pipe, output, s);
> +	}
> +}
> +
> +igt_main
> +{
> +	data_t data = {};
> +
> +	igt_fixture {
> +		igt_skip_on_simulation();
> +
> +		data.drm_fd = drm_open_driver(DRIVER_ANY);
> +
> +		igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);


Should this only check the intel_gen if the driver is an i915 device
(is_i915_device())?


-- 
Petri Latvala



> +
> +		igt_display_init(&data.display, data.drm_fd);
> +	}
> +
> +
> +	igt_subtest("legacy")
> +		test_content_protection(&data.display, COMMIT_LEGACY);
> +
> +	igt_subtest("atomic") {
> +		igt_require(data.display.is_atomic);
> +		test_content_protection(&data.display, COMMIT_ATOMIC);
> +	}
> +
> +	igt_fixture
> +		igt_display_fini(&data.display);
> +}
> diff --git a/tests/meson.build b/tests/meson.build
> index 59ccd9a6..b12c35c0 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -157,6 +157,7 @@ test_progs = [
>  	'kms_chv_cursor_fail',
>  	'kms_color',
>  	'kms_concurrent',
> +	'kms_content_protection',
>  	'kms_crtc_background_color',
>  	'kms_cursor_crc',
>  	'kms_cursor_legacy',
> -- 
> 2.15.0.531.g2ccb3012c9-goog
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/2] kms_content_protection: Add Content Protection test

[Sean Paul]

On Tue, Dec 5, 2017 at 3:22 AM, Petri Latvala <petri.latvala@intel.com> wrote:
> On Tue, Dec 05, 2017 at 12:23:33AM -0500, Sean Paul wrote:
>> Pretty simple test:
>> - initializes the output
>> - clears the content protection property
>> - verifies that it clears
>> - sets the content protection property to desired
>> - verifies that it transitions to enabled
>>
>> Does this for both legacy and atomic.
>>
>> Signed-off-by: Sean Paul <seanpaul@chromium.org>
>> ---
>>  lib/igt_kms.c                  |   3 +-
>>  lib/igt_kms.h                  |   1 +
>>  tests/Makefile.sources         |   1 +
>>  tests/kms_content_protection.c | 128 +++++++++++++++++++++++++++++++++++++++++
>>  tests/meson.build              |   1 +
>>  5 files changed, 133 insertions(+), 1 deletion(-)
>>  create mode 100644 tests/kms_content_protection.c
>>
>> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
>> index 125ecb19..907db694 100644
>> --- a/lib/igt_kms.c
>> +++ b/lib/igt_kms.c
>> @@ -190,7 +190,8 @@ const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
>>       "scaling mode",
>>       "CRTC_ID",
>>       "DPMS",
>> -     "Broadcast RGB"
>> +     "Broadcast RGB",
>> +     "Content Protection"
>>  };
>>
>>  /*
>> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
>> index 2a480bf3..93e59dc7 100644
>> --- a/lib/igt_kms.h
>> +++ b/lib/igt_kms.h
>> @@ -118,6 +118,7 @@ enum igt_atomic_connector_properties {
>>         IGT_CONNECTOR_CRTC_ID,
>>         IGT_CONNECTOR_DPMS,
>>         IGT_CONNECTOR_BROADCAST_RGB,
>> +       IGT_CONNECTOR_CONTENT_PROTECTION,
>>         IGT_NUM_CONNECTOR_PROPS
>>  };
>>
>> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
>> index 34ca71a0..e0466411 100644
>> --- a/tests/Makefile.sources
>> +++ b/tests/Makefile.sources
>> @@ -179,6 +179,7 @@ TESTS_progs = \
>>       kms_chv_cursor_fail \
>>       kms_color \
>>       kms_concurrent \
>> +     kms_content_protection\
>>       kms_crtc_background_color \
>>       kms_cursor_crc \
>>       kms_cursor_legacy \
>> diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
>> new file mode 100644
>> index 00000000..7bfe9a69
>> --- /dev/null
>> +++ b/tests/kms_content_protection.c
>> @@ -0,0 +1,128 @@
>> +/*
>> + * Copyright © 2017 Google, Inc.
>> + *
>> + * 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.h"
>> +
>> +IGT_TEST_DESCRIPTION("Test content protection (HDCP)");
>> +
>> +typedef struct {
>> +     int drm_fd;
>> +     igt_display_t display;
>> +} data_t;
>> +
>> +static bool
>> +wait_for_prop_value(igt_output_t *output, uint64_t expected)
>> +{
>> +     uint64_t val;
>> +     int i;
>> +
>> +     for (i = 0; i < 2000; i++) {
>> +             val = igt_output_get_prop(output,
>> +                                       IGT_CONNECTOR_CONTENT_PROTECTION);
>> +             if (val == expected)
>> +                     return true;
>> +             usleep(1000);
>> +     }
>> +     igt_info("prop_value mismatch %ld != %ld\n", val, expected);
>> +     return false;
>> +}
>> +
>> +static void
>> +test_pipe_output(igt_display_t *display, const enum pipe pipe,
>> +              igt_output_t *output, enum igt_commit_style s)
>> +{
>> +     drmModeModeInfo mode;
>> +     igt_plane_t *primary;
>> +     struct igt_fb red;
>> +     bool ret;
>> +
>> +     igt_assert(kmstest_get_connector_default_mode(
>> +                     display->drm_fd, output->config.connector, &mode));
>> +
>> +     igt_output_override_mode(output, &mode);
>> +     igt_output_set_pipe(output, pipe);
>> +
>> +     igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
>> +                         DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
>> +                         1.f, 0.f, 0.f, &red);
>> +     primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>> +     igt_plane_set_fb(primary, &red);
>> +     igt_display_commit2(display, s);
>> +
>> +     igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
>> +     igt_display_commit2(display, s);
>> +
>> +     ret = wait_for_prop_value(output, 0);
>> +     igt_require_f(ret, "Content Protection not cleared\n");
>> +
>> +     igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 1);
>> +     igt_display_commit2(display, s);
>> +
>> +     ret = wait_for_prop_value(output, 2);
>> +     igt_require_f(ret, "Content Protection not enabled\n");
>> +
>> +     igt_plane_set_fb(primary, NULL);
>> +     igt_output_set_pipe(output, PIPE_NONE);
>> +}
>> +
>> +static void
>> +test_content_protection(igt_display_t *display, enum igt_commit_style s)
>> +{
>> +     igt_output_t *output;
>> +     enum pipe pipe;
>> +
>> +     for_each_pipe_with_valid_output(display, pipe, output) {
>> +             if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
>> +                     continue;
>> +
>> +             test_pipe_output(display, pipe, output, s);
>> +     }
>> +}
>> +
>> +igt_main
>> +{
>> +     data_t data = {};
>> +
>> +     igt_fixture {
>> +             igt_skip_on_simulation();
>> +
>> +             data.drm_fd = drm_open_driver(DRIVER_ANY);
>> +
>> +             igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);
>
>
> Should this only check the intel_gen if the driver is an i915 device
> (is_i915_device())?
>

Good catch. I don't think the test needs to check for i915 or gen at
all. If the property is not present, it should just skip. I'll post a
v2 that does this.

Sean

>
> --
> Petri Latvala
>
>
>
>> +
>> +             igt_display_init(&data.display, data.drm_fd);
>> +     }
>> +
>> +
>> +     igt_subtest("legacy")
>> +             test_content_protection(&data.display, COMMIT_LEGACY);
>> +
>> +     igt_subtest("atomic") {
>> +             igt_require(data.display.is_atomic);
>> +             test_content_protection(&data.display, COMMIT_ATOMIC);
>> +     }
>> +
>> +     igt_fixture
>> +             igt_display_fini(&data.display);
>> +}
>> diff --git a/tests/meson.build b/tests/meson.build
>> index 59ccd9a6..b12c35c0 100644
>> --- a/tests/meson.build
>> +++ b/tests/meson.build
>> @@ -157,6 +157,7 @@ test_progs = [
>>       'kms_chv_cursor_fail',
>>       'kms_color',
>>       'kms_concurrent',
>> +     'kms_content_protection',
>>       'kms_crtc_background_color',
>>       'kms_cursor_crc',
>>       'kms_cursor_legacy',
>> --
>> 2.15.0.531.g2ccb3012c9-goog
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/2] kms_content_protection: Add Content Protection test

[Daniel Vetter]

On Tue, Dec 05, 2017 at 10:22:00AM +0200, Petri Latvala wrote:
> On Tue, Dec 05, 2017 at 12:23:33AM -0500, Sean Paul wrote:
> > Pretty simple test:
> > - initializes the output
> > - clears the content protection property
> > - verifies that it clears
> > - sets the content protection property to desired
> > - verifies that it transitions to enabled
> > 
> > Does this for both legacy and atomic.
> > 
> > Signed-off-by: Sean Paul <seanpaul@chromium.org>
> > ---
> >  lib/igt_kms.c                  |   3 +-
> >  lib/igt_kms.h                  |   1 +
> >  tests/Makefile.sources         |   1 +
> >  tests/kms_content_protection.c | 128 +++++++++++++++++++++++++++++++++++++++++
> >  tests/meson.build              |   1 +
> >  5 files changed, 133 insertions(+), 1 deletion(-)
> >  create mode 100644 tests/kms_content_protection.c
> > 
> > diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> > index 125ecb19..907db694 100644
> > --- a/lib/igt_kms.c
> > +++ b/lib/igt_kms.c
> > @@ -190,7 +190,8 @@ const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
> >  	"scaling mode",
> >  	"CRTC_ID",
> >  	"DPMS",
> > -	"Broadcast RGB"
> > +	"Broadcast RGB",
> > +	"Content Protection"
> >  };
> >  
> >  /*
> > diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> > index 2a480bf3..93e59dc7 100644
> > --- a/lib/igt_kms.h
> > +++ b/lib/igt_kms.h
> > @@ -118,6 +118,7 @@ enum igt_atomic_connector_properties {
> >         IGT_CONNECTOR_CRTC_ID,
> >         IGT_CONNECTOR_DPMS,
> >         IGT_CONNECTOR_BROADCAST_RGB,
> > +       IGT_CONNECTOR_CONTENT_PROTECTION,
> >         IGT_NUM_CONNECTOR_PROPS
> >  };
> >  
> > diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> > index 34ca71a0..e0466411 100644
> > --- a/tests/Makefile.sources
> > +++ b/tests/Makefile.sources
> > @@ -179,6 +179,7 @@ TESTS_progs = \
> >  	kms_chv_cursor_fail \
> >  	kms_color \
> >  	kms_concurrent \
> > +	kms_content_protection\
> >  	kms_crtc_background_color \
> >  	kms_cursor_crc \
> >  	kms_cursor_legacy \
> > diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
> > new file mode 100644
> > index 00000000..7bfe9a69
> > --- /dev/null
> > +++ b/tests/kms_content_protection.c
> > @@ -0,0 +1,128 @@
> > +/*
> > + * Copyright © 2017 Google, Inc.
> > + *
> > + * 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.h"
> > +
> > +IGT_TEST_DESCRIPTION("Test content protection (HDCP)");
> > +
> > +typedef struct {
> > +	int drm_fd;
> > +	igt_display_t display;
> > +} data_t;
> > +
> > +static bool
> > +wait_for_prop_value(igt_output_t *output, uint64_t expected)
> > +{
> > +	uint64_t val;
> > +	int i;
> > +
> > +	for (i = 0; i < 2000; i++) {
> > +		val = igt_output_get_prop(output,
> > +					  IGT_CONNECTOR_CONTENT_PROTECTION);
> > +		if (val == expected)
> > +			return true;
> > +		usleep(1000);
> > +	}
> > +	igt_info("prop_value mismatch %ld != %ld\n", val, expected);
> > +	return false;
> > +}
> > +
> > +static void
> > +test_pipe_output(igt_display_t *display, const enum pipe pipe,
> > +		 igt_output_t *output, enum igt_commit_style s)
> > +{
> > +	drmModeModeInfo mode;
> > +	igt_plane_t *primary;
> > +	struct igt_fb red;
> > +	bool ret;
> > +
> > +	igt_assert(kmstest_get_connector_default_mode(
> > +			display->drm_fd, output->config.connector, &mode));
> > +
> > +	igt_output_override_mode(output, &mode);
> > +	igt_output_set_pipe(output, pipe);
> > +
> > +	igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
> > +			    DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
> > +			    1.f, 0.f, 0.f, &red);
> > +	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> > +	igt_plane_set_fb(primary, &red);
> > +	igt_display_commit2(display, s);
> > +
> > +	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
> > +	igt_display_commit2(display, s);
> > +
> > +	ret = wait_for_prop_value(output, 0);
> > +	igt_require_f(ret, "Content Protection not cleared\n");
> > +
> > +	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 1);
> > +	igt_display_commit2(display, s);
> > +
> > +	ret = wait_for_prop_value(output, 2);
> > +	igt_require_f(ret, "Content Protection not enabled\n");
> > +
> > +	igt_plane_set_fb(primary, NULL);
> > +	igt_output_set_pipe(output, PIPE_NONE);
> > +}
> > +
> > +static void
> > +test_content_protection(igt_display_t *display, enum igt_commit_style s)
> > +{
> > +	igt_output_t *output;
> > +	enum pipe pipe;
> > +
> > +	for_each_pipe_with_valid_output(display, pipe, output) {
> > +		if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
> > +			continue;
> > +
> > +		test_pipe_output(display, pipe, output, s);
> > +	}
> > +}
> > +
> > +igt_main
> > +{
> > +	data_t data = {};
> > +
> > +	igt_fixture {
> > +		igt_skip_on_simulation();
> > +
> > +		data.drm_fd = drm_open_driver(DRIVER_ANY);
> > +
> > +		igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);
> 
> 
> Should this only check the intel_gen if the driver is an i915 device
> (is_i915_device())?

Imo this shouldn't check for intel gen at all. But instead enumerate HDMI
ports and check for the content protection property. If not there -> skip,
if there -> run the test and pass/fail.

That way the test should properly skip on any platform/kernel combo that
doesn't have hdcp - igt is supposed to be somewhat backwards/forward
compatible (within reasons, which amounts to about 1 year or so).
-Daniel

> 
> 
> -- 
> Petri Latvala
> 
> 
> 
> > +
> > +		igt_display_init(&data.display, data.drm_fd);
> > +	}
> > +
> > +
> > +	igt_subtest("legacy")
> > +		test_content_protection(&data.display, COMMIT_LEGACY);
> > +
> > +	igt_subtest("atomic") {
> > +		igt_require(data.display.is_atomic);
> > +		test_content_protection(&data.display, COMMIT_ATOMIC);
> > +	}
> > +
> > +	igt_fixture
> > +		igt_display_fini(&data.display);
> > +}
> > diff --git a/tests/meson.build b/tests/meson.build
> > index 59ccd9a6..b12c35c0 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -157,6 +157,7 @@ test_progs = [
> >  	'kms_chv_cursor_fail',
> >  	'kms_color',
> >  	'kms_concurrent',
> > +	'kms_content_protection',
> >  	'kms_crtc_background_color',
> >  	'kms_cursor_crc',
> >  	'kms_cursor_legacy',
> > -- 
> > 2.15.0.531.g2ccb3012c9-goog
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/2] kms_content_protection: Add Content Protection test

[Ville Syrjälä]

On Tue, Dec 05, 2017 at 12:23:33AM -0500, Sean Paul wrote:
> Pretty simple test:
> - initializes the output
> - clears the content protection property
> - verifies that it clears
> - sets the content protection property to desired
> - verifies that it transitions to enabled

Can we get a chamelium based test that actually verfifies
that the other end can correctly decrypt the data?

> 
> Does this for both legacy and atomic.
> 
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
>  lib/igt_kms.c                  |   3 +-
>  lib/igt_kms.h                  |   1 +
>  tests/Makefile.sources         |   1 +
>  tests/kms_content_protection.c | 128 +++++++++++++++++++++++++++++++++++++++++
>  tests/meson.build              |   1 +
>  5 files changed, 133 insertions(+), 1 deletion(-)
>  create mode 100644 tests/kms_content_protection.c
> 
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 125ecb19..907db694 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -190,7 +190,8 @@ const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
>  	"scaling mode",
>  	"CRTC_ID",
>  	"DPMS",
> -	"Broadcast RGB"
> +	"Broadcast RGB",
> +	"Content Protection"
>  };
>  
>  /*
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 2a480bf3..93e59dc7 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -118,6 +118,7 @@ enum igt_atomic_connector_properties {
>         IGT_CONNECTOR_CRTC_ID,
>         IGT_CONNECTOR_DPMS,
>         IGT_CONNECTOR_BROADCAST_RGB,
> +       IGT_CONNECTOR_CONTENT_PROTECTION,
>         IGT_NUM_CONNECTOR_PROPS
>  };
>  
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 34ca71a0..e0466411 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -179,6 +179,7 @@ TESTS_progs = \
>  	kms_chv_cursor_fail \
>  	kms_color \
>  	kms_concurrent \
> +	kms_content_protection\
>  	kms_crtc_background_color \
>  	kms_cursor_crc \
>  	kms_cursor_legacy \
> diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
> new file mode 100644
> index 00000000..7bfe9a69
> --- /dev/null
> +++ b/tests/kms_content_protection.c
> @@ -0,0 +1,128 @@
> +/*
> + * Copyright © 2017 Google, Inc.
> + *
> + * 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.h"
> +
> +IGT_TEST_DESCRIPTION("Test content protection (HDCP)");
> +
> +typedef struct {
> +	int drm_fd;
> +	igt_display_t display;
> +} data_t;
> +
> +static bool
> +wait_for_prop_value(igt_output_t *output, uint64_t expected)
> +{
> +	uint64_t val;
> +	int i;
> +
> +	for (i = 0; i < 2000; i++) {
> +		val = igt_output_get_prop(output,
> +					  IGT_CONNECTOR_CONTENT_PROTECTION);
> +		if (val == expected)
> +			return true;
> +		usleep(1000);
> +	}
> +	igt_info("prop_value mismatch %ld != %ld\n", val, expected);
> +	return false;
> +}
> +
> +static void
> +test_pipe_output(igt_display_t *display, const enum pipe pipe,
> +		 igt_output_t *output, enum igt_commit_style s)
> +{
> +	drmModeModeInfo mode;
> +	igt_plane_t *primary;
> +	struct igt_fb red;
> +	bool ret;
> +
> +	igt_assert(kmstest_get_connector_default_mode(
> +			display->drm_fd, output->config.connector, &mode));
> +
> +	igt_output_override_mode(output, &mode);
> +	igt_output_set_pipe(output, pipe);
> +
> +	igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
> +			    DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
> +			    1.f, 0.f, 0.f, &red);
> +	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> +	igt_plane_set_fb(primary, &red);
> +	igt_display_commit2(display, s);
> +
> +	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
> +	igt_display_commit2(display, s);
> +
> +	ret = wait_for_prop_value(output, 0);
> +	igt_require_f(ret, "Content Protection not cleared\n");
> +
> +	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 1);
> +	igt_display_commit2(display, s);
> +
> +	ret = wait_for_prop_value(output, 2);
> +	igt_require_f(ret, "Content Protection not enabled\n");
> +
> +	igt_plane_set_fb(primary, NULL);
> +	igt_output_set_pipe(output, PIPE_NONE);
> +}
> +
> +static void
> +test_content_protection(igt_display_t *display, enum igt_commit_style s)
> +{
> +	igt_output_t *output;
> +	enum pipe pipe;
> +
> +	for_each_pipe_with_valid_output(display, pipe, output) {
> +		if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
> +			continue;
> +
> +		test_pipe_output(display, pipe, output, s);
> +	}
> +}
> +
> +igt_main
> +{
> +	data_t data = {};
> +
> +	igt_fixture {
> +		igt_skip_on_simulation();
> +
> +		data.drm_fd = drm_open_driver(DRIVER_ANY);
> +
> +		igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);
> +
> +		igt_display_init(&data.display, data.drm_fd);
> +	}
> +
> +
> +	igt_subtest("legacy")
> +		test_content_protection(&data.display, COMMIT_LEGACY);
> +
> +	igt_subtest("atomic") {
> +		igt_require(data.display.is_atomic);
> +		test_content_protection(&data.display, COMMIT_ATOMIC);
> +	}
> +
> +	igt_fixture
> +		igt_display_fini(&data.display);
> +}
> diff --git a/tests/meson.build b/tests/meson.build
> index 59ccd9a6..b12c35c0 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -157,6 +157,7 @@ test_progs = [
>  	'kms_chv_cursor_fail',
>  	'kms_color',
>  	'kms_concurrent',
> +	'kms_content_protection',
>  	'kms_crtc_background_color',
>  	'kms_cursor_crc',
>  	'kms_cursor_legacy',
> -- 
> 2.15.0.531.g2ccb3012c9-goog
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/2] kms_content_protection: Add Content Protection test

[Sean Paul]

On Tue, Dec 5, 2017 at 11:07 AM, Ville Syrjälä
<ville.syrjala@linux.intel.com> wrote:
> On Tue, Dec 05, 2017 at 12:23:33AM -0500, Sean Paul wrote:
>> Pretty simple test:
>> - initializes the output
>> - clears the content protection property
>> - verifies that it clears
>> - sets the content protection property to desired
>> - verifies that it transitions to enabled
>
> Can we get a chamelium based test that actually verfifies
> that the other end can correctly decrypt the data?
>

I'm not certain chamelium has HDCP receiver support. I'm guessing it
doesn't, so not until we have that in place.

Sean

>>
>> Does this for both legacy and atomic.
>>
>> Signed-off-by: Sean Paul <seanpaul@chromium.org>
>> ---
>>  lib/igt_kms.c                  |   3 +-
>>  lib/igt_kms.h                  |   1 +
>>  tests/Makefile.sources         |   1 +
>>  tests/kms_content_protection.c | 128 +++++++++++++++++++++++++++++++++++++++++
>>  tests/meson.build              |   1 +
>>  5 files changed, 133 insertions(+), 1 deletion(-)
>>  create mode 100644 tests/kms_content_protection.c
>>
>> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
>> index 125ecb19..907db694 100644
>> --- a/lib/igt_kms.c
>> +++ b/lib/igt_kms.c
>> @@ -190,7 +190,8 @@ const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
>>       "scaling mode",
>>       "CRTC_ID",
>>       "DPMS",
>> -     "Broadcast RGB"
>> +     "Broadcast RGB",
>> +     "Content Protection"
>>  };
>>
>>  /*
>> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
>> index 2a480bf3..93e59dc7 100644
>> --- a/lib/igt_kms.h
>> +++ b/lib/igt_kms.h
>> @@ -118,6 +118,7 @@ enum igt_atomic_connector_properties {
>>         IGT_CONNECTOR_CRTC_ID,
>>         IGT_CONNECTOR_DPMS,
>>         IGT_CONNECTOR_BROADCAST_RGB,
>> +       IGT_CONNECTOR_CONTENT_PROTECTION,
>>         IGT_NUM_CONNECTOR_PROPS
>>  };
>>
>> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
>> index 34ca71a0..e0466411 100644
>> --- a/tests/Makefile.sources
>> +++ b/tests/Makefile.sources
>> @@ -179,6 +179,7 @@ TESTS_progs = \
>>       kms_chv_cursor_fail \
>>       kms_color \
>>       kms_concurrent \
>> +     kms_content_protection\
>>       kms_crtc_background_color \
>>       kms_cursor_crc \
>>       kms_cursor_legacy \
>> diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
>> new file mode 100644
>> index 00000000..7bfe9a69
>> --- /dev/null
>> +++ b/tests/kms_content_protection.c
>> @@ -0,0 +1,128 @@
>> +/*
>> + * Copyright © 2017 Google, Inc.
>> + *
>> + * 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.h"
>> +
>> +IGT_TEST_DESCRIPTION("Test content protection (HDCP)");
>> +
>> +typedef struct {
>> +     int drm_fd;
>> +     igt_display_t display;
>> +} data_t;
>> +
>> +static bool
>> +wait_for_prop_value(igt_output_t *output, uint64_t expected)
>> +{
>> +     uint64_t val;
>> +     int i;
>> +
>> +     for (i = 0; i < 2000; i++) {
>> +             val = igt_output_get_prop(output,
>> +                                       IGT_CONNECTOR_CONTENT_PROTECTION);
>> +             if (val == expected)
>> +                     return true;
>> +             usleep(1000);
>> +     }
>> +     igt_info("prop_value mismatch %ld != %ld\n", val, expected);
>> +     return false;
>> +}
>> +
>> +static void
>> +test_pipe_output(igt_display_t *display, const enum pipe pipe,
>> +              igt_output_t *output, enum igt_commit_style s)
>> +{
>> +     drmModeModeInfo mode;
>> +     igt_plane_t *primary;
>> +     struct igt_fb red;
>> +     bool ret;
>> +
>> +     igt_assert(kmstest_get_connector_default_mode(
>> +                     display->drm_fd, output->config.connector, &mode));
>> +
>> +     igt_output_override_mode(output, &mode);
>> +     igt_output_set_pipe(output, pipe);
>> +
>> +     igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
>> +                         DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
>> +                         1.f, 0.f, 0.f, &red);
>> +     primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>> +     igt_plane_set_fb(primary, &red);
>> +     igt_display_commit2(display, s);
>> +
>> +     igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
>> +     igt_display_commit2(display, s);
>> +
>> +     ret = wait_for_prop_value(output, 0);
>> +     igt_require_f(ret, "Content Protection not cleared\n");
>> +
>> +     igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 1);
>> +     igt_display_commit2(display, s);
>> +
>> +     ret = wait_for_prop_value(output, 2);
>> +     igt_require_f(ret, "Content Protection not enabled\n");
>> +
>> +     igt_plane_set_fb(primary, NULL);
>> +     igt_output_set_pipe(output, PIPE_NONE);
>> +}
>> +
>> +static void
>> +test_content_protection(igt_display_t *display, enum igt_commit_style s)
>> +{
>> +     igt_output_t *output;
>> +     enum pipe pipe;
>> +
>> +     for_each_pipe_with_valid_output(display, pipe, output) {
>> +             if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
>> +                     continue;
>> +
>> +             test_pipe_output(display, pipe, output, s);
>> +     }
>> +}
>> +
>> +igt_main
>> +{
>> +     data_t data = {};
>> +
>> +     igt_fixture {
>> +             igt_skip_on_simulation();
>> +
>> +             data.drm_fd = drm_open_driver(DRIVER_ANY);
>> +
>> +             igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);
>> +
>> +             igt_display_init(&data.display, data.drm_fd);
>> +     }
>> +
>> +
>> +     igt_subtest("legacy")
>> +             test_content_protection(&data.display, COMMIT_LEGACY);
>> +
>> +     igt_subtest("atomic") {
>> +             igt_require(data.display.is_atomic);
>> +             test_content_protection(&data.display, COMMIT_ATOMIC);
>> +     }
>> +
>> +     igt_fixture
>> +             igt_display_fini(&data.display);
>> +}
>> diff --git a/tests/meson.build b/tests/meson.build
>> index 59ccd9a6..b12c35c0 100644
>> --- a/tests/meson.build
>> +++ b/tests/meson.build
>> @@ -157,6 +157,7 @@ test_progs = [
>>       'kms_chv_cursor_fail',
>>       'kms_color',
>>       'kms_concurrent',
>> +     'kms_content_protection',
>>       'kms_crtc_background_color',
>>       'kms_cursor_crc',
>>       'kms_cursor_legacy',
>> --
>> 2.15.0.531.g2ccb3012c9-goog
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length

[Patchwork]

== Series Details ==

Series: series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length
URL   : https://patchwork.freedesktop.org/series/34881/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
88b01d822be1e9ab429ef1085f6754a47dae3487 igt/pm_rc6_residency: Measure residency after checking for applicability

with latest DRM-Tip kernel build CI_DRM_3452
cee3f135bf4e drm-tip: 2017y-12m-04d-21h-06m-29s UTC integration manifest

Testlist changes:
+igt@kms_content_protection@atomic
+igt@kms_content_protection@legacy

Test debugfs_test:
        Subgroup read_all_entries:
                dmesg-fail -> DMESG-WARN (fi-elk-e7500) fdo#103989
                pass       -> DMESG-WARN (fi-bdw-gvtdvm) fdo#103938 +1
Test gem_exec_reloc:
        Subgroup basic-gtt-read-active:
                pass       -> FAIL       (fi-gdg-551) fdo#102582 +1

fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#103938 https://bugs.freedesktop.org/show_bug.cgi?id=103938
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:440s
fi-bdw-gvtdvm    total:288  pass:262  dwarn:2   dfail:0   fail:0   skip:24  time:442s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:390s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:533s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:283s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:507s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:502s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:492s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:476s
fi-elk-e7500     total:224  pass:163  dwarn:15  dfail:0   fail:0   skip:45 
fi-gdg-551       total:288  pass:176  dwarn:1   dfail:0   fail:3   skip:108 time:269s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:537s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:373s
fi-hsw-4770r     total:288  pass:224  dwarn:0   dfail:0   fail:0   skip:64  time:268s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:400s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:487s
fi-ivb-3770      total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:452s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:491s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:524s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:479s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:536s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:539s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:569s
fi-skl-6700k     total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:521s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:499s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:448s
fi-snb-2520m     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:549s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:422s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:613s
fi-cnl-y         total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:612s
fi-glk-dsi       total:205  pass:184  dwarn:0   dfail:0   fail:1   skip:19 

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_596/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: warning for series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length

[Patchwork]

== Series Details ==

Series: series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length
URL   : https://patchwork.freedesktop.org/series/34881/
State : warning

== Summary ==

Test gem_tiled_swapping:
        Subgroup non-threaded:
                pass       -> INCOMPLETE (shard-hsw) fdo#104009
Test kms_flip:
        Subgroup flip-vs-modeset-vs-hang-interruptible:
                pass       -> DMESG-WARN (shard-snb)
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
                pass       -> FAIL       (shard-snb) fdo#101623 +1
Test drv_selftest:
        Subgroup mock_sanitycheck:
                pass       -> DMESG-WARN (shard-snb) fdo#102707 +1

fdo#104009 https://bugs.freedesktop.org/show_bug.cgi?id=104009
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707

shard-hsw        total:2623 pass:1499 dwarn:2   dfail:0   fail:9   skip:1112 time:9330s
shard-snb        total:2681 pass:1306 dwarn:3   dfail:0   fail:12  skip:1360 time:8164s
Blacklisted hosts:
shard-apl        total:2659 pass:1657 dwarn:1   dfail:0   fail:23  skip:977 time:13252s
shard-kbl        total:2681 pass:1797 dwarn:1   dfail:0   fail:24  skip:859 time:10805s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_596/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✗ Fi.CI.IGT: warning for series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length

[Petri Latvala]

On Tue, Dec 05, 2017 at 06:35:20AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length
> URL   : https://patchwork.freedesktop.org/series/34881/
> State : warning
> 
> == Summary ==
> 
> Test gem_tiled_swapping:
>         Subgroup non-threaded:
>                 pass       -> INCOMPLETE (shard-hsw) fdo#104009
> Test kms_flip:
>         Subgroup flip-vs-modeset-vs-hang-interruptible:
>                 pass       -> DMESG-WARN (shard-snb)
> Test kms_frontbuffer_tracking:
>         Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
>                 pass       -> FAIL       (shard-snb) fdo#101623 +1
> Test drv_selftest:
>         Subgroup mock_sanitycheck:
>                 pass       -> DMESG-WARN (shard-snb) fdo#102707 +1
> 
> fdo#104009 https://bugs.freedesktop.org/show_bug.cgi?id=104009
> fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
> fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
> 
> shard-hsw        total:2623 pass:1499 dwarn:2   dfail:0   fail:9   skip:1112 time:9330s
> shard-snb        total:2681 pass:1306 dwarn:3   dfail:0   fail:12  skip:1360 time:8164s
> Blacklisted hosts:
> shard-apl        total:2659 pass:1657 dwarn:1   dfail:0   fail:23  skip:977 time:13252s
> shard-kbl        total:2681 pass:1797 dwarn:1   dfail:0   fail:24  skip:859 time:10805s
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_596/shards.html

Only the full results at
https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_596/shards-all.html
show results for the new tests. For the record, both new tests passed
on shard-kbl and shard-apl, skipped on shard-snb and shard-hsw.



-- 
Petri Latvala
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✗ Fi.CI.IGT: warning for series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length

[Petri Latvala]

On Tue, Dec 05, 2017 at 10:26:50AM +0200, Petri Latvala wrote:
> On Tue, Dec 05, 2017 at 06:35:20AM +0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: series starting with [1/2] CONTRIBUTING: Fix spelling mistake and line length
> > URL   : https://patchwork.freedesktop.org/series/34881/
> > State : warning
> > 
> > == Summary ==
> > 
> > Test gem_tiled_swapping:
> >         Subgroup non-threaded:
> >                 pass       -> INCOMPLETE (shard-hsw) fdo#104009
> > Test kms_flip:
> >         Subgroup flip-vs-modeset-vs-hang-interruptible:
> >                 pass       -> DMESG-WARN (shard-snb)
> > Test kms_frontbuffer_tracking:
> >         Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
> >                 pass       -> FAIL       (shard-snb) fdo#101623 +1
> > Test drv_selftest:
> >         Subgroup mock_sanitycheck:
> >                 pass       -> DMESG-WARN (shard-snb) fdo#102707 +1
> > 
> > fdo#104009 https://bugs.freedesktop.org/show_bug.cgi?id=104009
> > fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
> > fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
> > 
> > shard-hsw        total:2623 pass:1499 dwarn:2   dfail:0   fail:9   skip:1112 time:9330s
> > shard-snb        total:2681 pass:1306 dwarn:3   dfail:0   fail:12  skip:1360 time:8164s
> > Blacklisted hosts:
> > shard-apl        total:2659 pass:1657 dwarn:1   dfail:0   fail:23  skip:977 time:13252s
> > shard-kbl        total:2681 pass:1797 dwarn:1   dfail:0   fail:24  skip:859 time:10805s
> > 
> > == Logs ==
> > 
> > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_596/shards.html
> 
> Only the full results at
> https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_596/shards-all.html
> show results for the new tests. For the record, both new tests passed
> on shard-kbl and shard-apl, skipped on shard-snb and shard-hsw.

And to clarify: The skips seem correct, but since the HDCP code is not
yet in the kernel, the passes are incorrect.


-- 
Petri Latvala
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 1/2] CONTRIBUTING: Fix spelling mistake and line length

[Petri Latvala]

On Tue, Dec 05, 2017 at 12:23:32AM -0500, Sean Paul wrote:
> Noticed while I was reading it. Makes for a good first contribution, I
> guess.
> 
> Signed-off-by: Sean Paul <seanpaul@chromium.org>

Reviewed-by: Petri Latvala <petri.latvala@intel.com>



> ---
>  CONTRIBUTING | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/CONTRIBUTING b/CONTRIBUTING
> index 561c5dd8..ca2ed8a5 100644
> --- a/CONTRIBUTING
> +++ b/CONTRIBUTING
> @@ -18,13 +18,13 @@ A short list of contribution guidelines:
>  
>    on its first invocation.
>  
> -- intel-gpu-tools is MIT lincensed and we require contributions to follow the
> +- intel-gpu-tools is MIT licensed and we require contributions to follow the
>    developer's certificate of origin: http://developercertificate.org/
>  
>  - When submitting new testcases please follow the naming conventions documented
> -  in the generated documentation. Also please make full use of all the helpers and
> -  convenience macros provided by the igt library. The semantic patch lib/igt.cocci
> -  can help with the more automatic conversions.
> +  in the generated documentation. Also please make full use of all the helpers
> +  and convenience macros provided by the igt library. The semantic patch
> +  lib/igt.cocci can help with the more automatic conversions.
>  
>  - Patches need to be reviewed on the mailing list. Exceptions only apply for
>    testcases and tooling for drivers with just a single contributor (e.g. vc4).
> -- 
> 2.15.0.531.g2ccb3012c9-goog
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx