[igt-dev] [PATCH i-g-t 1/4] Make basic chamelium function accessible to other tests

[Dixit, Ashutosh]

On Mon, 26 Apr 2021 02:32:03 -0700, Kunal Joshi wrote:
>
> diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h
> index bfcb7bb4..a4ace397 100644
> --- a/lib/igt_chamelium.h
> +++ b/lib/igt_chamelium.h
> @@ -32,6 +32,7 @@
>  #include <xf86drmMode.h>
>
>  #include "igt_debugfs.h"
> +#include "igt_kms.h"
>
>  struct igt_fb;
>  struct edid;
> @@ -81,6 +82,11 @@ struct chamelium_infoframe {
>
>  struct chamelium_edid;
>
> +/* Set of Video Identification Codes advertised in the EDID */
> +static const uint8_t edid_ar_svds[] = {
> +	16, /* 1080p @ 60Hz, 16:9 */
> +};
> +

Because lib/igt_kms.c includes igt_chamelium.h only if HAVE_CHAMELIUM is
#ifdef'd, this breaks the build on systems on which HAVE_CHAMELIUM is not
defined:

../lib/igt_kms.c: In function ‘igt_kms_get_aspect_ratio_edid’:
../lib/igt_kms.c:521:54: error: ‘edid_ar_svds’ undeclared (first use in this function);>
  521 |  cea_data_size += edid_cea_data_block_set_svd(block, edid_ar_svds,
      |                                                      ^~~~~~~~~~~~
      |                                                      edid_4k_svds
../lib/igt_kms.c:521:54: note: each undeclared identifier is reported only once for eac>
[13/837] Compiling C object lib/libi915_perf.so.1.p/meson-generated_.._i915_perf_metric>

So IGT build is now broken.