[igt-dev] [PATCH] kms_chamelium: fix a compile warning

[Mark Yacoub]

On Fri, Nov 4, 2022 at 2:49 PM Alex Hung <alex.hung at amd.com> wrote:
>
> Fix the following warning:
>
> ../tests/chamelium/kms_chamelium.c: In function ‘edid_stress_resolution’:
> ../tests/chamelium/kms_chamelium.c:2570:31: warning: declaration of ‘monitor_edid’ shadows a global declaration [-Wshadow]
>  2570 |                 monitor_edid *monitor_edid = &edids_list[i];
>       |                               ^~~~~~~~~~~~
> In file included from ../lib/monitor_edids/dp_edids.h:15,
>                  from ../tests/chamelium/kms_chamelium.c:33:
> ../lib/monitor_edids/monitor_edids_helper.h:25:3: note: shadowed declaration is here
>    25 | } monitor_edid;
>       |   ^~~~~~~~~~~~
>
> Fixes: 6a25c536 (kms_chamelium: Add new EDID stress resolution test)
> Signed-off-by: Alex Hung <alex.hung at amd.com>
Reviewed-by: Mark Yacoub <markyacoub at chromium.org>
> ---
>  tests/chamelium/kms_chamelium.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/chamelium/kms_chamelium.c b/tests/chamelium/kms_chamelium.c
> index c824e67e..09839f98 100644
> --- a/tests/chamelium/kms_chamelium.c
> +++ b/tests/chamelium/kms_chamelium.c
> @@ -2567,13 +2567,13 @@ static void edid_stress_resolution(data_t *data, struct chamelium_port *port,
>                 bool is_video_stable;
>                 int screen_res_w, screen_res_h;
>
> -               monitor_edid *monitor_edid = &edids_list[i];
> +               monitor_edid *edid = &edids_list[i];
>                 igt_info("Testing out the EDID for %s\n",
> -                        monitor_edid_get_name(monitor_edid));
> +                        monitor_edid_get_name(edid));
>
>                 /* Getting and Setting the EDID on Chamelium. */
>                 chamelium_edid = get_chameleon_edid_from_monitor_edid(
> -                       chamelium, monitor_edid);
> +                       chamelium, edid);
>                 chamelium_port_set_edid(data->chamelium, port, chamelium_edid);
>                 free_chamelium_edid_from_monitor_edid(chamelium_edid);
>
> --
> 2.34.1
>