[PATCH i-g-t v2 1/5] lib/monitor_edids: Add helper functions for using monitor_edid objects

[Kamil Konieczny]

Hi Louis,
On 2024-10-22 at 14:53:10 +0200, Louis Chauvet wrote:

in you e-mail header I found in cc:

	20241022-b4-cv3-01-igt-kms-v2-0-8f654694b513 at bootlin.com

Is it correct?

> Introduce the functions edid_from_monitor_edid() and
> get_edids_for_connector_type(). The former converts a monitor_edid object
> to a struct edid, which can then be utilized by igt_kms helpers. The
> latter returns a list of monitor_edid objects for a specific connector
> with certain characteristics
> 

Add here to Cc developer e-mails, found with 'git blame', so +cc

Cc: Mark Yacoub <markyacoub at chromium.org>
Cc: Mark Yacoub <markyacoub at google.com>

> Signed-off-by: Louis Chauvet <louis.chauvet at bootlin.com>
> ---
>  lib/monitor_edids/monitor_edids_helper.c | 61 +++++++++++++++++++++++++++++++-
>  lib/monitor_edids/monitor_edids_helper.h |  5 +++
>  2 files changed, 65 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/monitor_edids/monitor_edids_helper.c b/lib/monitor_edids/monitor_edids_helper.c
> index 1cbf1c22f0bb..0e0c2a9badcf 100644
> --- a/lib/monitor_edids/monitor_edids_helper.c
> +++ b/lib/monitor_edids/monitor_edids_helper.c
> @@ -14,7 +14,10 @@
>  #include <string.h>
>  #include <assert.h>
>  
> -#include "igt_core.h"

Nice! igt_core here could be an overkill.

> +#include "igt.h"
> +#include "igt_edid.h"
> +#include "dp_edids.h"
> +#include "hdmi_edids.h"
>  
>  static uint8_t convert_hex_char_to_byte(char c)
>  {
> @@ -90,3 +93,59 @@ void free_chamelium_edid_from_monitor_edid(struct chamelium_edid *edid)
>  	free(edid);
>  	edid = NULL;
>  }
> +

Add description to each new lib function.

> +struct edid *edid_from_monitor_edid(const monitor_edid *mon_edid)
> +{
> +	uint8_t *raw_edid;
> +	size_t edid_size;
> +	int i;
> +
> +	edid_size = strlen(mon_edid->edid) / 2; /* each ascii is a nibble. */
> +	raw_edid = malloc(edid_size);
> +	igt_assert(raw_edid);
> +
> +	for (i = 0; i < edid_size; i++) {
> +		raw_edid[i] = convert_hex_char_to_byte(mon_edid->edid[i * 2]) << 4 |
> +			      convert_hex_char_to_byte(mon_edid->edid[i * 2 + 1]);
> +	}
> +
> +	if (edid_get_size((struct edid *)raw_edid) > edid_size) {
> +		uint8_t *new_edid;
> +
> +		igt_warn("The edid size stored in the raw edid is shorter than the edid stored in the table.");

Warn could result in test failure, why not igt_debug()?

> +		new_edid = realloc(raw_edid, edid_get_size((struct edid *)raw_edid));
> +		igt_assert(new_edid);
> +		raw_edid = new_edid;
> +	}
> +
> +	return (struct edid *)raw_edid;
> +}
> +

Same here, add description.

> +struct monitor_edid *get_edids_for_connector_type(uint32_t type, size_t *count, bool four_k)
> +{
> +	if (four_k) {

Do you really need function with 'bool' param?
Why not two functions, one for 4K display and second for non-4K-capable?

> +		switch (type) {
> +		case DRM_MODE_CONNECTOR_DisplayPort:
> +			*count = ARRAY_SIZE(DP_EDIDS_4K);
> +			return DP_EDIDS_4K;

instead of returning here, add

	return *count;

at function end.

> +		case DRM_MODE_CONNECTOR_HDMIA:
> +			*count = ARRAY_SIZE(HDMI_EDIDS_4K);
> +			return HDMI_EDIDS_4K;
> +		default:
> +			igt_assert_f(0, "No 4k EDID for the connector %s\n",
> +				     kmstest_connector_type_str(type));
> +		}
> +	} else {
> +		switch (type) {
> +		case DRM_MODE_CONNECTOR_DisplayPort:
> +			*count = ARRAY_SIZE(DP_EDIDS_NON_4K);
> +			return DP_EDIDS_NON_4K;
> +		case DRM_MODE_CONNECTOR_HDMIA:
> +			*count = ARRAY_SIZE(HDMI_EDIDS_NON_4K);
> +			return HDMI_EDIDS_NON_4K;
> +		default:
> +			igt_assert_f(0, "No EDID for the connector %s\n",
> +				     kmstest_connector_type_str(type));
> +		}
> +	}
> +}
> diff --git a/lib/monitor_edids/monitor_edids_helper.h b/lib/monitor_edids/monitor_edids_helper.h
> index 05679f0897f3..2ec7aee5f13f 100644
> --- a/lib/monitor_edids/monitor_edids_helper.h
> +++ b/lib/monitor_edids/monitor_edids_helper.h
> @@ -12,6 +12,8 @@
>  #define TESTS_CHAMELIUM_MONITOR_EDIDS_MONITOR_EDIDS_HELPER_H_
>  
>  #include <stdint.h>
> +#include <stddef.h>
> +#include <stdbool.h>
>  
>  #include "igt_chamelium.h"
>  
> @@ -30,4 +32,7 @@ get_chameleon_edid_from_monitor_edid(struct chamelium *chamelium,
>  				     const monitor_edid *edid);
>  void free_chamelium_edid_from_monitor_edid(struct chamelium_edid *edid);
>  
> +struct edid *edid_from_monitor_edid(const monitor_edid *monitor_edid);
> +struct monitor_edid *get_edids_for_connector_type(uint32_t type, size_t *count, bool four_k);
> +
>  #endif /* TESTS_CHAMELIUM_MONITOR_EDIDS_MONITOR_EDIDS_HELPER_H_ */
> \ No newline at end of file

Add newline.

Regards,
Kamil

> 
> -- 
> 2.46.2
>