[PATCH 6/6] drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0

[Alex Deucher]

On Thu, Jul 21, 2022 at 5:52 AM Horace Chen <horace.chen at amd.com> wrote:
>
> SRIOV needs to initialize mmsch instead of multimedia engines
> directly. So currently remove them for SR-IOV until the code and
> firmwares are ready.
>
> Signed-off-by: Horace Chen <horace.chen at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index f559fda2811f..3f7e1d683df3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -1900,8 +1900,10 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev)
>                 case IP_VERSION(4, 0, 0):
>                 case IP_VERSION(4, 0, 2):
>                 case IP_VERSION(4, 0, 4):
> -                       amdgpu_device_ip_block_add(adev, &vcn_v4_0_ip_block);
> -                       amdgpu_device_ip_block_add(adev, &jpeg_v4_0_ip_block);
> +                       if (!amdgpu_sriov_vf(adev)) {
> +                               amdgpu_device_ip_block_add(adev, &vcn_v4_0_ip_block);
> +                               amdgpu_device_ip_block_add(adev, &jpeg_v4_0_ip_block);
> +                       }
>                         break;
>                 default:
>                         dev_err(adev->dev,
> --
> 2.25.1
>