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: <20221129071032.2154949-1-konstantin.meskhidze@huawei.com>
In-Reply-To: <20221129071032.2154949-1-konstantin.meskhidze@huawei.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Tue, 29 Nov 2022 10:27:55 -0500
Message-ID: <CADnq5_OkpKY25gPQJWVGb859EJrG2uqL4J9DW_Yiut9iN6AhKQ@mail.gmail.com>
Subject: Re: [PATCH] drm: amdgpu: Fix logic error
To:     Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
Cc:     alexander.deucher@amd.com, yifan1.zhang@amd.com,
        lijo.lazar@amd.com, yusongping@huawei.com, guchun.chen@amd.com,
        artem.kuzin@huawei.com, Xinhui.Pan@amd.com,
        linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org,
        mdaenzer@redhat.com, nirmoy.das@amd.com,
        dri-devel@lists.freedesktop.org, hukeping@huawei.com,
        evan.quan@amd.com, christian.koenig@amd.com, Hawking.Zhang@amd.com
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Applied.  Thanks!

Alex

On Tue, Nov 29, 2022 at 2:49 AM Konstantin Meskhidze
<konstantin.meskhidze@huawei.com> wrote:
>
> This commit fixes logic error in function 'amdgpu_hw_ip_info':
>        - value 'uvd' might be 'vcn'.
>
> Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index fe23e09eec98..28752a6a92c4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -424,7 +424,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
>         case AMDGPU_HW_IP_VCN_DEC:
>                 type = AMD_IP_BLOCK_TYPE_VCN;
>                 for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
> -                       if (adev->uvd.harvest_config & (1 << i))
> +                       if (adev->vcn.harvest_config & (1 << i))
>                                 continue;
>
>                         if (adev->vcn.inst[i].ring_dec.sched.ready)
> @@ -436,7 +436,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
>         case AMDGPU_HW_IP_VCN_ENC:
>                 type = AMD_IP_BLOCK_TYPE_VCN;
>                 for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
> -                       if (adev->uvd.harvest_config & (1 << i))
> +                       if (adev->vcn.harvest_config & (1 << i))
>                                 continue;
>
>                         for (j = 0; j < adev->vcn.num_enc_rings; j++)
> --
> 2.25.1
>