[igt-dev] [PATCH i-g-t v2] tests/kms_content_protection: Skip if not able to create display_hdcp_srm.bin

[Petri Latvala]

On Thu, Jun 24, 2021 at 03:53:30PM -0700, Khaled Almahallawy wrote:
> On Chrome devices, SRM subtest fails to create display_hdcp_srm.bin file because
> Chrome OS rootfs is mounted read-only by default
> (https://chromium.googlesource.com/chromiumos/docs/+/HEAD/developer_mode.md#disable-verity).
> The error below is observed in Chrome:
> 
>     (kms_content_protection:9022) DEBUG: Test requirement passed: data.display.is_atomic
>     (kms_content_protection:9022) CRITICAL: Test assertion failure function __real_main720, file ../igt-gpu-tools-1.25/tests/kms_content_protection.c:807:
>     (kms_content_protection:9022) CRITICAL: Failed assertion: ret
>     (kms_content_protection:9022) CRITICAL: Last errno: 9, Bad file descriptor
>     (kms_content_protection:9022) CRITICAL: SRM update failedStack trace:
> 
> This patch fixes that by checking if the file descriptor returned from the
> open call is valid and skip if it is not.
> 
> v2: Log message (Petri)
> 
> Cc: Mark Yacoub <markyacoub at chromium.org>
> Cc: Petri Latvala <petri.latvala at intel.com>
> Cc: Arkadiusz Hiler <arek at hiler.eu>
> Reported-by: Shawn Lee <shawn.c.lee at intel.com>
> Signed-off-by: Khaled Almahallawy <khaled.almahallawy at intel.com>

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




> ---
>  tests/kms_content_protection.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
> index a0a136da6e8d..bab61817bcc1 100644
> --- a/tests/kms_content_protection.c
> +++ b/tests/kms_content_protection.c
> @@ -296,6 +296,8 @@ static bool write_srm_as_fw(const __u8 *srm, int len)
>  
>  	fd = open("/lib/firmware/display_hdcp_srm.bin",
>  		  O_WRONLY | O_CREAT, S_IRWXU);
> +	igt_require_f(fd >= 0, "Cannot write SRM binary to /lib/firmware\n");
> +
>  	do {
>  		ret = write(fd, srm + total, len - total);
>  		if (ret < 0)
> -- 
> 2.25.1
>