MIME-Version: 1.0
References: <20230309033654.64762-1-jiapeng.chong@linux.alibaba.com>
In-Reply-To: <20230309033654.64762-1-jiapeng.chong@linux.alibaba.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Wed, 8 Mar 2023 22:50:56 -0500
Message-ID: <CADnq5_NEYTz3kU+2BRC9x3hyMGO7+hEmr4zoabKpU9uzW3xG8g@mail.gmail.com>
Subject: Re: [PATCH] drm/amdgpu: Remove useless else if
To:     Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Cc:     alexander.deucher@amd.com, Xinhui.Pan@amd.com,
        Abaci Robot <abaci@linux.alibaba.com>,
        linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, christian.koenig@amd.com
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Mar 8, 2023 at 10:37 PM Jiapeng Chong
<jiapeng.chong@linux.alibaba.com> wrote:
>
> The assignment of the else and if branches is the same, so the if else
> here is redundant, so we remove it.
>
> ./drivers/gpu/drm/amd/amdgpu/nv.c:1048:2-4: WARNING: possible condition with no effect (if == else).
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4454
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/nv.c | 18 +++++-------------
>  1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 855d390c41de..84803929f7d9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -1045,19 +1045,11 @@ static int nv_common_late_init(void *handle)
>
>         if (amdgpu_sriov_vf(adev)) {
>                 xgpu_nv_mailbox_get_irq(adev);
> -               if (adev->vcn.harvest_config & AMDGPU_VCN_HARVEST_VCN0) {
> -                       amdgpu_virt_update_sriov_video_codec(adev,
> -                                                            sriov_sc_video_codecs_encode_array,
> -                                                            ARRAY_SIZE(sriov_sc_video_codecs_encode_array),
> -                                                            sriov_sc_video_codecs_decode_array_vcn1,
> -                                                            ARRAY_SIZE(sriov_sc_video_codecs_decode_array_vcn1));
> -               } else {
> -                       amdgpu_virt_update_sriov_video_codec(adev,
> -                                                            sriov_sc_video_codecs_encode_array,
> -                                                            ARRAY_SIZE(sriov_sc_video_codecs_encode_array),
> -                                                            sriov_sc_video_codecs_decode_array_vcn1,
> -                                                            ARRAY_SIZE(sriov_sc_video_codecs_decode_array_vcn1));

This should be vcn0.  I'll send out a patch.  Thanks!

Alex


> -               }
> +               amdgpu_virt_update_sriov_video_codec(adev,
> +                                                    sriov_sc_video_codecs_encode_array,
> +                                                    ARRAY_SIZE(sriov_sc_video_codecs_encode_array),
> +                                                    sriov_sc_video_codecs_decode_array_vcn1,
> +                                                    ARRAY_SIZE(sriov_sc_video_codecs_decode_array_vcn1));
>         }
>
>         return 0;
> --
> 2.20.1.7.g153144c
>