MIME-Version: 1.0
References: <20230317081718.2650744-1-lee@kernel.org> <20230317081718.2650744-21-lee@kernel.org>
In-Reply-To: <20230317081718.2650744-21-lee@kernel.org>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Fri, 17 Mar 2023 16:30:39 -0400
Message-ID: <CADnq5_Pj31O7Xvikn4SpCdxp3vkfYe0+PKxev-1VoECPk0YP-Q@mail.gmail.com>
Subject: Re: [PATCH 20/37] drm/amd/display/amdgpu_dm/amdgpu_dm_helpers: Move
 defines out to where they are actually used
To:     Lee Jones <lee@kernel.org>
Cc:     dri-devel@lists.freedesktop.org, Leo Li <sunpeng.li@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

Alex

On Fri, Mar 17, 2023 at 4:23=E2=80=AFAM Lee Jones <lee@kernel.org> wrote:
>
> Fixes the following W=3D1 kernel build warning(s):
>
>   drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h: At t=
op level:
>   drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:143:2=
2:
>       warning: =E2=80=98SYNAPTICS_DEVICE_ID=E2=80=99 defined but not used=
 [-Wunused-const-variable=3D]
>   drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:140:2=
2:
>       warning: =E2=80=98DP_VGA_LVDS_CONVERTER_ID_3=E2=80=99 defined but n=
ot used [-Wunused-const-variable=3D]
>   drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:138:2=
2:
>       warning: =E2=80=98DP_VGA_LVDS_CONVERTER_ID_2=E2=80=99 defined but n=
ot used [-Wunused-const-variable=3D]
>   drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:133:2=
2:
>       warning: =E2=80=98DP_SINK_DEVICE_STR_ID_2=E2=80=99 defined but not =
used [-Wunused-const-variable=3D]
>   drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:132:2=
2:
>       warning: =E2=80=98DP_SINK_DEVICE_STR_ID_1=E2=80=99 defined but not =
used [-Wunused-const-variable=3D]
>
> [snip 400 similar lines brevity]
>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Leo Li <sunpeng.li@amd.com>
> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian K=C3=B6nig" <christian.koenig@amd.com>
> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee@kernel.org>
> ---
>  .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c   |  3 +++
>  drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c       |  3 +++
>  .../gpu/drm/amd/display/dc/link/link_detection.c    |  2 ++
>  .../dc/link/protocols/link_edp_panel_control.c      |  5 +++++
>  .../gpu/drm/amd/display/include/ddc_service_types.h | 13 -------------
>  5 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/=
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
> index 9c1e91c2179eb..330ab036c830f 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
> @@ -44,6 +44,9 @@
>  #include "dm_helpers.h"
>  #include "ddc_service_types.h"
>
> +/* MST Dock */
> +static const uint8_t SYNAPTICS_DEVICE_ID[] =3D "SYNA";
> +
>  /* dm_helpers_parse_edid_caps
>   *
>   * Parse edid caps
> diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/=
drm/amd/display/dc/dce/dmub_psr.c
> index 19440bdf63449..27b8f3435d86f 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
> @@ -33,6 +33,9 @@
>
>  #define MAX_PIPES 6
>
> +static const uint8_t DP_SINK_DEVICE_STR_ID_1[] =3D {7, 1, 8, 7, 3};
> +static const uint8_t DP_SINK_DEVICE_STR_ID_2[] =3D {7, 1, 8, 7, 5};
> +
>  /*
>   * Convert dmcub psr state to dmcu psr state.
>   */
> diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drive=
rs/gpu/drm/amd/display/dc/link/link_detection.c
> index 8cfeddfb65c89..9177b146a80a8 100644
> --- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
> +++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
> @@ -60,6 +60,8 @@
>   */
>  #define LINK_TRAINING_MAX_VERIFY_RETRY 2
>
> +static const u8 DP_SINK_BRANCH_DEV_NAME_7580[] =3D "7580\x80u";
> +
>  static const uint8_t dp_hdmi_dongle_signature_str[] =3D "DP-HDMI ADAPTOR=
";
>
>  static enum ddc_transaction_type get_ddc_transaction_type(enum signal_ty=
pe sink_signal)
> diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel=
_control.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_c=
ontrol.c
> index 93a6bbe954bb7..d895046787bc4 100644
> --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_contro=
l.c
> +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_contro=
l.c
> @@ -37,6 +37,11 @@
>  #include "abm.h"
>  #define DC_LOGGER_INIT(logger)
>
> +/* Travis */
> +static const uint8_t DP_VGA_LVDS_CONVERTER_ID_2[] =3D "sivarT";
> +/* Nutmeg */
> +static const uint8_t DP_VGA_LVDS_CONVERTER_ID_3[] =3D "dnomlA";
> +
>  void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mo=
de)
>  {
>         union dpcd_edp_config edp_config_set;
> diff --git a/drivers/gpu/drm/amd/display/include/ddc_service_types.h b/dr=
ivers/gpu/drm/amd/display/include/ddc_service_types.h
> index 31a12ce79a8e0..f843fc4978552 100644
> --- a/drivers/gpu/drm/amd/display/include/ddc_service_types.h
> +++ b/drivers/gpu/drm/amd/display/include/ddc_service_types.h
> @@ -129,17 +129,4 @@ struct av_sync_data {
>         uint8_t aud_del_ins3;/* DPCD 0002Dh */
>  };
>
> -static const uint8_t DP_SINK_DEVICE_STR_ID_1[] =3D {7, 1, 8, 7, 3};
> -static const uint8_t DP_SINK_DEVICE_STR_ID_2[] =3D {7, 1, 8, 7, 5};
> -
> -static const u8 DP_SINK_BRANCH_DEV_NAME_7580[] =3D "7580\x80u";
> -
> -/*Travis*/
> -static const uint8_t DP_VGA_LVDS_CONVERTER_ID_2[] =3D "sivarT";
> -/*Nutmeg*/
> -static const uint8_t DP_VGA_LVDS_CONVERTER_ID_3[] =3D "dnomlA";
> -
> -/*MST Dock*/
> -static const uint8_t SYNAPTICS_DEVICE_ID[] =3D "SYNA";
> -
>  #endif /* __DAL_DDC_SERVICE_TYPES_H__ */
> --
> 2.40.0.rc1.284.g88254d51c5-goog
>