[PATCH AUTOSEL 6.1 10/10] drm/amdkfd: disable IOMMUv2 support for Raven

[Deucher, Alexander]

[Public]

> -----Original Message-----
> From: Sasha Levin <sashal at kernel.org>
> Sent: Tuesday, August 22, 2023 7:36 AM
> To: linux-kernel at vger.kernel.org; stable at vger.kernel.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Kuehling, Felix
> <Felix.Kuehling at amd.com>; Koenig, Christian <Christian.Koenig at amd.com>;
> Mike Lothian <mike at fireburn.co.uk>; Sasha Levin <sashal at kernel.org>; Pan,
> Xinhui <Xinhui.Pan at amd.com>; airlied at gmail.com; daniel at ffwll.ch; amd-
> gfx at lists.freedesktop.org; dri-devel at lists.freedesktop.org
> Subject: [PATCH AUTOSEL 6.1 10/10] drm/amdkfd: disable IOMMUv2
> support for Raven
>
> From: Alex Deucher <alexander.deucher at amd.com>
>
> [ Upstream commit 091ae5473f96ced844af6ba39b94757359b12348 ]
>
> Use the dGPU path instead.  There were a lot of platform issues with IOMMU
> in general on these chips due to windows not enabling IOMMU at the time.
> The dGPU path has been used for a long time with newer APUs and works
> fine.  This also paves the way to simplify the driver significantly.


This is not needed for stable.

Alex

>
> Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>
> Acked-by: Christian König <christian.koenig at amd.com>
> Tested-by: Mike Lothian <mike at fireburn.co.uk>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Sasha Levin <sashal at kernel.org>
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 -------
>  1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 4cc5debdd119b..af18378e58d9f 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -185,11 +185,6 @@ static void kfd_device_info_init(struct kfd_dev *kfd,
>
>               kfd_device_info_set_event_interrupt_class(kfd);
>
> -             /* Raven */
> -             if (gc_version == IP_VERSION(9, 1, 0) ||
> -                 gc_version == IP_VERSION(9, 2, 2))
> -                     kfd->device_info.needs_iommu_device = true;
> -
>               if (gc_version < IP_VERSION(11, 0, 0)) {
>                       /* Navi2x+, Navi1x+ */
>                       if (gc_version == IP_VERSION(10, 3, 6)) @@ -287,7
> +282,6 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev,
> bool vf)
>                       gfx_target_version = 90000;
>                       f2g = &gfx_v9_kfd2kgd;
>                       break;
> -#ifdef KFD_SUPPORT_IOMMU_V2
>               /* Raven */
>               case IP_VERSION(9, 1, 0):
>               case IP_VERSION(9, 2, 2):
> @@ -295,7 +289,6 @@ struct kfd_dev *kgd2kfd_probe(struct
> amdgpu_device *adev, bool vf)
>                       if (!vf)
>                               f2g = &gfx_v9_kfd2kgd;
>                       break;
> -#endif
>               /* Vega12 */
>               case IP_VERSION(9, 2, 1):
>                       gfx_target_version = 90004;
> --
> 2.40.1