Re: [PATCH AUTOSEL 6.4 10/11] drm/amdkfd: disable IOMMUv2 support for KV/CZ

[Alex Deucher]

On Tue, Aug 22, 2023 at 7:36 AM Sasha Levin <sashal@xxxxxxxxxx> wrote:
>
> From: Alex Deucher <alexander.deucher@xxxxxxx>
>
> [ Upstream commit 616f92d188ee7142a95a52068efdbea82645f859 ]
>
> 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.
>
> v2: use the dGPU queue manager functions
>
> Reviewed-by: Felix Kuehling <Felix.Kuehling@xxxxxxx>
> Acked-by: Christian König <christian.koenig@xxxxxxx>
> Tested-by: Mike Lothian <mike@xxxxxxxxxxxxxx>
> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

This is not necessary for stable.

Alex

> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c               | 6 ------
>  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +-------
>  2 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 00f528eb98126..9c8197573dee7 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -224,10 +224,6 @@ static void kfd_device_info_init(struct kfd_dev *kfd,
>                     asic_type != CHIP_TONGA)
>                         kfd->device_info.supports_cwsr = true;
>
> -               if (asic_type == CHIP_KAVERI ||
> -                   asic_type == CHIP_CARRIZO)
> -                       kfd->device_info.needs_iommu_device = true;
> -
>                 if (asic_type != CHIP_HAWAII && !vf)
>                         kfd->device_info.needs_pci_atomics = true;
>         }
> @@ -240,7 +236,6 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
>         uint32_t gfx_target_version = 0;
>
>         switch (adev->asic_type) {
> -#ifdef KFD_SUPPORT_IOMMU_V2
>  #ifdef CONFIG_DRM_AMDGPU_CIK
>         case CHIP_KAVERI:
>                 gfx_target_version = 70000;
> @@ -253,7 +248,6 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
>                 if (!vf)
>                         f2g = &gfx_v8_kfd2kgd;
>                 break;
> -#endif
>  #ifdef CONFIG_DRM_AMDGPU_CIK
>         case CHIP_HAWAII:
>                 gfx_target_version = 70001;
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> index 7a95698d83f73..c73417e79745e 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> @@ -2335,18 +2335,12 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
>         }
>
>         switch (dev->adev->asic_type) {
> -       case CHIP_CARRIZO:
> -               device_queue_manager_init_vi(&dqm->asic_ops);
> -               break;
> -
>         case CHIP_KAVERI:
> -               device_queue_manager_init_cik(&dqm->asic_ops);
> -               break;
> -
>         case CHIP_HAWAII:
>                 device_queue_manager_init_cik_hawaii(&dqm->asic_ops);
>                 break;
>
> +       case CHIP_CARRIZO:
>         case CHIP_TONGA:
>         case CHIP_FIJI:
>         case CHIP_POLARIS10:
> --
> 2.40.1
>