Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210601081400.123089-1-libaokun1@huawei.com>
In-Reply-To: <20210601081400.123089-1-libaokun1@huawei.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Tue, 1 Jun 2021 22:10:27 -0400
Message-ID: <CADnq5_NuuogmYcmTDofwt0txUHJhx1EJvseeUWwQdq39z74MCw@mail.gmail.com>
Subject: =?UTF-8?B?UmU6IFtQQVRDSCAtbmV4dF0gZHJtL2FtZC9kaXNwbGF5OiBmaXggd2FybmluZzog4oCYdQ==?=
        =?UTF-8?B?cGRhdGVfZHNjX2NhcHPigJkgYW5kIOKAmGFwcGx5X2RzY19wb2xpY3lfZm9yX3N0cmVhbeKAmSBkZWZp?=
        =?UTF-8?B?bmVkIGJ1dCBub3QgdXNlZA==?=
To:     Baokun Li <libaokun1@huawei.com>
Cc:     "Wentland, Harry" <harry.wentland@amd.com>,
        "Leo (Sunpeng) Li" <sunpeng.li@amd.com>,
        "Deucher, Alexander" <alexander.deucher@amd.com>,
        Christian Koenig <christian.koenig@amd.com>,
        xinhui pan <Xinhui.Pan@amd.com>,
        Dave Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com>,
        "Siqueira, Rodrigo" <Rodrigo.Siqueira@amd.com>,
        Aurabindo Pillai <aurabindo.pillai@amd.com>,
        Qingqing Zhuo <qingqing.zhuo@amd.com>,
        Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>,
        Nikola Cornij <nikola.cornij@amd.com>,
        Wayne Lin <Wayne.Lin@amd.com>,
        amd-gfx list <amd-gfx@lists.freedesktop.org>,
        Maling list - DRI developers 
        <dri-devel@lists.freedesktop.org>,
        LKML <linux-kernel@vger.kernel.org>,
        YueHaibing <yuehaibing@huawei.com>,
        Wei Yongjun <weiyongjun1@huawei.com>,
        yu kuai <yukuai3@huawei.com>, yangjihong1@huawei.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

On Tue, Jun 1, 2021 at 4:04 AM Baokun Li <libaokun1@huawei.com> wrote:
>
> Fixes gcc '-Wunused-function' warning:
>
> =E2=80=98update_dsc_caps=E2=80=99 and =E2=80=98apply_dsc_policy_for_strea=
m=E2=80=99 are only used
> if 'CONFIG_DRM_AMD_DC_DCN' is defined,
>
> however, it's defined even if 'CONFIG_DRM_AMD_DC_DCN' is not defined.
> Thus gcc will report following warning
> if 'CONFIG_DRM_AMD_DC_DCN' is not defined:
>
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5572:13: warn=
ing:
> =E2=80=98apply_dsc_policy_for_stream=E2=80=99 defined but not used [-Wunu=
sed-function]
>
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5556:13: warn=
ing:
> =E2=80=98update_dsc_caps=E2=80=99 defined but not used [-Wunused-function=
]
>
> Thus move the definition of =E2=80=98update_dsc_caps=E2=80=99 and
> =E2=80=98apply_dsc_policy_for_stream=E2=80=99 inside define macro to fix =
it.
>
> Signed-off-by: Baokun Li <libaokun1@huawei.com>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/=
gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index f0adfda32213..e0af394103aa 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -5553,6 +5553,7 @@ static void dm_enable_per_frame_crtc_master_sync(st=
ruct dc_state *context)
>         }
>  }
>
> +#if defined(CONFIG_DRM_AMD_DC_DCN)
>  static void update_dsc_caps(struct amdgpu_dm_connector *aconnector,
>                                                         struct dc_sink *s=
ink, struct dc_stream_state *stream,
>                                                         struct dsc_dec_dp=
cd_caps *dsc_caps)
> @@ -5560,12 +5561,10 @@ static void update_dsc_caps(struct amdgpu_dm_conn=
ector *aconnector,
>         stream->timing.flags.DSC =3D 0;
>
>         if (aconnector->dc_link && sink->sink_signal =3D=3D SIGNAL_TYPE_D=
ISPLAY_PORT) {
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
>                 dc_dsc_parse_dsc_dpcd(aconnector->dc_link->ctx->dc,
>                                       aconnector->dc_link->dpcd_caps.dsc_=
caps.dsc_basic_caps.raw,
>                                       aconnector->dc_link->dpcd_caps.dsc_=
caps.dsc_branch_decoder_caps.raw,
>                                       dsc_caps);
> -#endif
>         }
>  }
>
> @@ -5578,7 +5577,6 @@ static void apply_dsc_policy_for_stream(struct amdg=
pu_dm_connector *aconnector,
>
>         link_bandwidth_kbps =3D dc_link_bandwidth_kbps(aconnector->dc_lin=
k,
>                                                         dc_link_get_link_=
cap(aconnector->dc_link));
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
>         /* Set DSC policy according to dsc_clock_en */
>         dc_dsc_policy_set_enable_dsc_when_not_needed(
>                 aconnector->dsc_settings.dsc_force_enable =3D=3D DSC_CLK_=
FORCE_ENABLE);
> @@ -5609,8 +5607,8 @@ static void apply_dsc_policy_for_stream(struct amdg=
pu_dm_connector *aconnector,
>
>         if (stream->timing.flags.DSC && aconnector->dsc_settings.dsc_bits=
_per_pixel)
>                 stream->timing.dsc_cfg.bits_per_pixel =3D aconnector->dsc=
_settings.dsc_bits_per_pixel;
> -#endif
>  }
> +#endif
>
>  static struct drm_display_mode *
>  get_highest_refresh_rate_mode(struct amdgpu_dm_connector *aconnector,
> --
> 2.31.1
>