On Wed, Nov 24, 2021 at 9:20 AM Jane Jian <Jane.Jian@xxxxxxx> wrote: > > [WHY] > for sriov odd# vf will modify vcn0 engine ip revision(due to multimedia bandwidth feature), > which will be mismatched with original vcn0 revision > > [HOW] > add new version check for vcn0 disabled revision(3, 0, 192), typically modified under > sriov mode > > Signed-off-by: Jane Jian <Jane.Jian@xxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > Change-Id: I1ace32acbf3a13c0baac958508da1324ec387a58 > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > index 503995c7ff6c..3f9b7b0bab3c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > @@ -923,6 +923,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) > amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block); > break; > case IP_VERSION(3, 0, 33): > + case IP_VERSION(3, 0, 192): > amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block); > break; > default: > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > index 4f7c70845785..585961c2f5f2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > @@ -135,6 +135,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) > break; > case IP_VERSION(3, 0, 0): > case IP_VERSION(3, 0, 64): > + case IP_VERSION(3, 0, 192): > if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 0)) > fw_name = FIRMWARE_SIENNA_CICHLID; > else > -- > 2.17.1 >
