|
[AMD Official Use Only]
No that's fine. Just checking.
Alex
From: Chen, Guchun <Guchun.Chen@xxxxxxx>
Sent: Tuesday, February 22, 2022 9:29 PM To: Alex Deucher <alexdeucher@xxxxxxxxx> Cc: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Zhang, Hawking <Hawking.Zhang@xxxxxxx>; Koenig, Christian <Christian.Koenig@xxxxxxx>; Pan, Xinhui <Xinhui.Pan@xxxxxxx> Subject: RE: [PATCH] drm/amdgpu: limit harvest bit read on several ASICs Hi Alex,
This patch has covered the check of VCN as well. So you want me to modify the comments to add VCN as well? Regards, Guchun -----Original Message----- From: Alex Deucher <alexdeucher@xxxxxxxxx> Sent: Wednesday, February 23, 2022 1:00 AM To: Chen, Guchun <Guchun.Chen@xxxxxxx> Cc: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Zhang, Hawking <Hawking.Zhang@xxxxxxx>; Koenig, Christian <Christian.Koenig@xxxxxxx>; Pan, Xinhui <Xinhui.Pan@xxxxxxx> Subject: Re: [PATCH] drm/amdgpu: limit harvest bit read on several ASICs On Tue, Feb 22, 2022 at 10:07 AM Guchun Chen <guchun.chen@xxxxxxx> wrote: > > Due to faulty VBIOS out there, harvest bit setting is not consistently > correct especially for display IP. So far, it's hard to work out a > solution on all the legacy Navi1x ASICs in a short time, so to avoid > regression, limit harvest bit read on several ASICs. Will revisit > later once VBIOS has corrected it in long term. > Looks like it may be incorrect for VCN as well. Double check that. Alex > Fixes: b3f4ea887d5f("drm/amdgpu: read harvest bit per IP data on > legacy GPUs") > Signed-off-by: Guchun Chen <guchun.chen@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > index 11255290f117..2e0ff1ace6fc 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > @@ -1129,12 +1129,20 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) > * so read harvest bit per IP data structure to set > * harvest configuration. > */ > - if (adev->ip_versions[GC_HWIP][0] < IP_VERSION(10, 2, 0)) > - amdgpu_discovery_read_harvest_bit_per_ip(adev, > - &vcn_harvest_count); > - else > + if (adev->ip_versions[GC_HWIP][0] < IP_VERSION(10, 2, 0)) { > + if ((adev->pdev->device == 0x731E && > + (adev->pdev->revision == 0xC6 || > + adev->pdev->revision == 0xC7)) || > + (adev->pdev->device == 0x7340 && > + adev->pdev->revision == 0xC9) || > + (adev->pdev->device == 0x7360 && > + adev->pdev->revision == 0xC7)) > + amdgpu_discovery_read_harvest_bit_per_ip(adev, > + &vcn_harvest_count); > + } else { > amdgpu_disocvery_read_from_harvest_table(adev, > - &vcn_harvest_count); > + &vcn_harvest_count); > + } > > amdgpu_discovery_harvest_config_quirk(adev); > > -- > 2.17.1 > |
