Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230118093011.3796248-1-arnd@kernel.org>
In-Reply-To: <20230118093011.3796248-1-arnd@kernel.org>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Wed, 18 Jan 2023 11:27:31 -0500
Message-ID: <CADnq5_PF7j+X6_o7tVrnhnKhSY9=gASSgxzpTwPJ7WEq=YsR+Q@mail.gmail.com>
Subject: Re: [PATCH] drm/amd/display: fix dp_retrieve_lttpr_cap() return value
To:     Arnd Bergmann <arnd@kernel.org>
Cc:     Harry Wentland <harry.wentland@amd.com>,
        Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Lewis Huang <Lewis.Huang@amd.com>,
        Wesley Chalmers <Wesley.Chalmers@amd.com>,
        Arnd Bergmann <arnd@arndb.de>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        Wenjing Liu <wenjing.liu@amd.com>,
        linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org,
        dri-devel@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"
Precedence: bulk

Applied.  Thanks!

Alex

On Wed, Jan 18, 2023 at 4:30 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> gcc-13 notices a mismatch between the return type of dp_retrieve_lttpr_cap()
> and the returned value:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c: In function 'dp_retrieve_lttpr_cap':
> drivers/gpu/drm/amd/amdgpu/../display/dc/link/link_dp_capability.c:1465:24: error: implicit conversion from 'enum <anonymous>' to 'enum dc_status' [-Werror=enum-conversion]
>  1465 |                 return false;
>       |                        ^~~~~
>
> Change the value to an actual dc_status code and remove the bogus
> initialization that was apparently meant to get returned here.
>
> Fixes: b473bd5fc333 ("drm/amd/display: refine wake up aux in retrieve link caps")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpu/drm/amd/display/dc/link/link_dp_capability.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/link/link_dp_capability.c b/drivers/gpu/drm/amd/display/dc/link/link_dp_capability.c
> index 088f4291bfbf..e72ad1b8330f 100644
> --- a/drivers/gpu/drm/amd/display/dc/link/link_dp_capability.c
> +++ b/drivers/gpu/drm/amd/display/dc/link/link_dp_capability.c
> @@ -1455,14 +1455,14 @@ static bool dpcd_read_sink_ext_caps(struct dc_link *link)
>  enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link)
>  {
>         uint8_t lttpr_dpcd_data[8];
> -       enum dc_status status = DC_ERROR_UNEXPECTED;
> -       bool is_lttpr_present = false;
> +       enum dc_status status;
> +       bool is_lttpr_present;
>
>         /* Logic to determine LTTPR support*/
>         bool vbios_lttpr_interop = link->dc->caps.vbios_lttpr_aware;
>
>         if (!vbios_lttpr_interop || !link->dc->caps.extended_aux_timeout_support)
> -               return false;
> +               return DC_ERROR_UNEXPECTED;
>
>         /* By reading LTTPR capability, RX assumes that we will enable
>          * LTTPR extended aux timeout if LTTPR is present.
> --
> 2.39.0
>