[PATCH 05/25] drm/amdgpu: Remove unused kfd2kgd interface

[Oded Gabbay]

Patches 1-5 applied to -next
Thanks,
Oded

On Wed, Feb 7, 2018 at 3:32 AM, Felix Kuehling <Felix.Kuehling at amd.com> wrote:
> Signed-off-by: Felix Kuehling <Felix.Kuehling at amd.com>
> Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c |  9 ---------
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 10 ----------
>  drivers/gpu/drm/amd/include/kgd_kfd_interface.h   |  2 --
>  3 files changed, 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> index b8be7b96..1362181 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> @@ -139,7 +139,6 @@ static uint32_t kgd_address_watch_get_offset(struct kgd_dev *kgd,
>  static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd, uint8_t vmid);
>  static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
>                                                         uint8_t vmid);
> -static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid);
>
>  static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);
>  static void set_scratch_backing_va(struct kgd_dev *kgd,
> @@ -196,7 +195,6 @@ static const struct kfd2kgd_calls kfd2kgd = {
>         .address_watch_get_offset = kgd_address_watch_get_offset,
>         .get_atc_vmid_pasid_mapping_pasid = get_atc_vmid_pasid_mapping_pasid,
>         .get_atc_vmid_pasid_mapping_valid = get_atc_vmid_pasid_mapping_valid,
> -       .write_vmid_invalidate_request = write_vmid_invalidate_request,
>         .get_fw_version = get_fw_version,
>         .set_scratch_backing_va = set_scratch_backing_va,
>         .get_tile_config = get_tile_config,
> @@ -790,13 +788,6 @@ static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
>         return reg & ATC_VMID0_PASID_MAPPING__PASID_MASK;
>  }
>
> -static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid)
> -{
> -       struct amdgpu_device *adev = (struct amdgpu_device *) kgd;
> -
> -       WREG32(mmVM_INVALIDATE_REQUEST, 1 << vmid);
> -}
> -
>  static void set_scratch_backing_va(struct kgd_dev *kgd,
>                                         uint64_t va, uint32_t vmid)
>  {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> index 744c05b..5130eac 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> @@ -81,7 +81,6 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd,
>                                 uint32_t queue_id);
>  static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,
>                                 unsigned int utimeout);
> -static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid);
>  static int kgd_address_watch_disable(struct kgd_dev *kgd);
>  static int kgd_address_watch_execute(struct kgd_dev *kgd,
>                                         unsigned int watch_point_id,
> @@ -99,7 +98,6 @@ static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd,
>                 uint8_t vmid);
>  static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
>                 uint8_t vmid);
> -static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid);
>  static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);
>  static void set_scratch_backing_va(struct kgd_dev *kgd,
>                                         uint64_t va, uint32_t vmid);
> @@ -157,7 +155,6 @@ static const struct kfd2kgd_calls kfd2kgd = {
>                         get_atc_vmid_pasid_mapping_pasid,
>         .get_atc_vmid_pasid_mapping_valid =
>                         get_atc_vmid_pasid_mapping_valid,
> -       .write_vmid_invalidate_request = write_vmid_invalidate_request,
>         .get_fw_version = get_fw_version,
>         .set_scratch_backing_va = set_scratch_backing_va,
>         .get_tile_config = get_tile_config,
> @@ -707,13 +704,6 @@ static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
>         return reg & ATC_VMID0_PASID_MAPPING__PASID_MASK;
>  }
>
> -static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid)
> -{
> -       struct amdgpu_device *adev = (struct amdgpu_device *) kgd;
> -
> -       WREG32(mmVM_INVALIDATE_REQUEST, 1 << vmid);
> -}
> -
>  static int kgd_address_watch_disable(struct kgd_dev *kgd)
>  {
>         return 0;
> diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> index a6752bd..94eab548 100644
> --- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> +++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> @@ -258,8 +258,6 @@ struct kfd2kgd_calls {
>         uint16_t (*get_atc_vmid_pasid_mapping_pasid)(
>                                         struct kgd_dev *kgd,
>                                         uint8_t vmid);
> -       void (*write_vmid_invalidate_request)(struct kgd_dev *kgd,
> -                                       uint8_t vmid);
>
>         uint16_t (*get_fw_version)(struct kgd_dev *kgd,
>                                 enum kgd_engine_type type);
> --
> 2.7.4
>