[igt-dev] [v2 3/4] tests/kms: use dp-mst helpers

[Modem, Bhanuprakash]

On Thu-10-08-2023 01:47 pm, Swati Sharma wrote:
> Remove duplicate code and use helpers instead.
> 
> v2: -fixed if() (CI)
> 
> Signed-off-by: Swati Sharma <swati2.sharma at intel.com>

LGTM
Reviewed-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>

> ---
>   tests/kms_content_protection.c | 34 ++-------------------------------
>   tests/kms_display_modes.c      | 35 ++--------------------------------
>   2 files changed, 4 insertions(+), 65 deletions(-)
> 
> diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
> index 6cdf81a28..b65d7cd0b 100644
> --- a/tests/kms_content_protection.c
> +++ b/tests/kms_content_protection.c
> @@ -534,43 +534,15 @@ test_content_protection(enum igt_commit_style s, int content_type)
>   		igt_cleanup_uevents(data.uevent_monitor);
>   }
>   
> -static int parse_path_blob(char *blob_data)
> -{
> -	int connector_id;
> -	char *encoder;
> -
> -	encoder = strtok(blob_data, ":");
> -	igt_assert_f(!strcmp(encoder, "mst"), "PATH connector property expected to have 'mst'\n");
> -
> -	connector_id = atoi(strtok(NULL, "-"));
> -
> -	return connector_id;
> -}
> -
>   static bool output_is_dp_mst(igt_output_t *output, int i)
>   {
> -	drmModePropertyBlobPtr path_blob = NULL;
> -	uint64_t path_blob_id;
> -	drmModeConnector *connector = output->config.connector;
> -	struct kmstest_connector_config config;
> -	const char *encoder;
>   	int connector_id;
>   	static int prev_connector_id;
>   
> -	kmstest_get_connector_config(data.drm_fd, output->config.connector->connector_id, -1, &config);
> -	encoder = kmstest_encoder_type_str(config.encoder->encoder_type);
> -
> -	if (strcmp(encoder, "DP MST"))
> +	connector_id = igt_get_dp_mst_connector_id(data.drm_fd, output);
> +	if (connector_id < 0)
>   		return false;
>   
> -	igt_assert(kmstest_get_property(data.drm_fd, connector->connector_id,
> -		   DRM_MODE_OBJECT_CONNECTOR, "PATH", NULL,
> -		   &path_blob_id, NULL));
> -
> -	igt_assert(path_blob = drmModeGetPropertyBlob(data.drm_fd, path_blob_id));
> -
> -	connector_id = parse_path_blob((char *) path_blob->data);
> -
>   	/*
>   	 * Discarding outputs of other DP MST topology.
>   	 * Testing only on outputs on the topology we got previously
> @@ -582,8 +554,6 @@ static bool output_is_dp_mst(igt_output_t *output, int i)
>   			return false;
>   	}
>   
> -	drmModeFreePropertyBlob(path_blob);
> -
>   	return true;
>   }
>   
> diff --git a/tests/kms_display_modes.c b/tests/kms_display_modes.c
> index 93d91ef5b..84fc7738b 100644
> --- a/tests/kms_display_modes.c
> +++ b/tests/kms_display_modes.c
> @@ -77,46 +77,15 @@ static drmModeModeInfo *get_mode(igt_output_t *output)
>   	return required_mode;
>   }
>   
> -static int parse_path_blob(char *blob_data)
> -{
> -	int connector_id;
> -	char *encoder;
> -
> -	encoder = strtok(blob_data, ":");
> -	igt_assert_f(!strcmp(encoder, "mst"), "PATH connector property expected to have 'mst'\n");
> -
> -	connector_id = atoi(strtok(NULL, "-"));
> -
> -	return connector_id;
> -}
> -
>   static bool output_is_dp_mst(data_t *data, igt_output_t *output, int i)
>   {
> -	drmModePropertyBlobPtr path_blob = NULL;
> -	uint64_t path_blob_id;
> -	drmModeConnector *connector = output->config.connector;
> -	struct kmstest_connector_config config;
> -	const char *encoder;
>   	int connector_id;
>   	static int prev_connector_id;
>   
> -	kmstest_get_connector_config(data->drm_fd, output->config.connector->connector_id,
> -				     -1, &config);
> -	encoder = kmstest_encoder_type_str(config.encoder->encoder_type);
> -
> -	if (strcmp(encoder, "DP MST"))
> +	connector_id = igt_get_dp_mst_connector_id(data->drm_fd, output);
> +	if (connector_id < 0)
>   		return false;
>   
> -	igt_assert(kmstest_get_property(data->drm_fd, connector->connector_id,
> -		   DRM_MODE_OBJECT_CONNECTOR, "PATH", NULL,
> -		   &path_blob_id, NULL));
> -
> -	igt_assert(path_blob = drmModeGetPropertyBlob(data->drm_fd, path_blob_id));
> -
> -	connector_id = parse_path_blob((char *) path_blob->data);
> -
> -	drmModeFreePropertyBlob(path_blob);
> -
>   	/*
>   	 * Discarding outputs of other DP MST topology.
>   	 * Testing only on outputs on the topology we got previously