aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Kuehling <Felix.Kuehling@amd.com>2018-02-06 20:32:34 -0500
committerOded Gabbay <oded.gabbay@gmail.com>2018-02-06 20:32:34 -0500
commit1029a3f33678afb8978285209ec5cfe153fe44ef (patch)
tree943873a9ba490ff20167ebd658a26a2d21da63c5
parent2f901c25eb35a1b24a6006b9b668ad8bf88da582 (diff)
drm/amdgpu: Remove unused kfd2kgd interface
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c9
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c10
-rw-r--r--drivers/gpu/drm/amd/include/kgd_kfd_interface.h2
3 files changed, 0 insertions, 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 b8be7b961b7e..1362181b10d0 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,
139static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd, uint8_t vmid); 139static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd, uint8_t vmid);
140static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd, 140static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
141 uint8_t vmid); 141 uint8_t vmid);
142static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid);
143 142
144static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type); 143static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);
145static void set_scratch_backing_va(struct kgd_dev *kgd, 144static void set_scratch_backing_va(struct kgd_dev *kgd,
@@ -196,7 +195,6 @@ static const struct kfd2kgd_calls kfd2kgd = {
196 .address_watch_get_offset = kgd_address_watch_get_offset, 195 .address_watch_get_offset = kgd_address_watch_get_offset,
197 .get_atc_vmid_pasid_mapping_pasid = get_atc_vmid_pasid_mapping_pasid, 196 .get_atc_vmid_pasid_mapping_pasid = get_atc_vmid_pasid_mapping_pasid,
198 .get_atc_vmid_pasid_mapping_valid = get_atc_vmid_pasid_mapping_valid, 197 .get_atc_vmid_pasid_mapping_valid = get_atc_vmid_pasid_mapping_valid,
199 .write_vmid_invalidate_request = write_vmid_invalidate_request,
200 .get_fw_version = get_fw_version, 198 .get_fw_version = get_fw_version,
201 .set_scratch_backing_va = set_scratch_backing_va, 199 .set_scratch_backing_va = set_scratch_backing_va,
202 .get_tile_config = get_tile_config, 200 .get_tile_config = get_tile_config,
@@ -790,13 +788,6 @@ static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
790 return reg & ATC_VMID0_PASID_MAPPING__PASID_MASK; 788 return reg & ATC_VMID0_PASID_MAPPING__PASID_MASK;
791} 789}
792 790
793static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid)
794{
795 struct amdgpu_device *adev = (struct amdgpu_device *) kgd;
796
797 WREG32(mmVM_INVALIDATE_REQUEST, 1 << vmid);
798}
799
800static void set_scratch_backing_va(struct kgd_dev *kgd, 791static void set_scratch_backing_va(struct kgd_dev *kgd,
801 uint64_t va, uint32_t vmid) 792 uint64_t va, uint32_t vmid)
802{ 793{
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 744c05b186d5..5130eac7afdd 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,
81 uint32_t queue_id); 81 uint32_t queue_id);
82static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 82static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,
83 unsigned int utimeout); 83 unsigned int utimeout);
84static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid);
85static int kgd_address_watch_disable(struct kgd_dev *kgd); 84static int kgd_address_watch_disable(struct kgd_dev *kgd);
86static int kgd_address_watch_execute(struct kgd_dev *kgd, 85static int kgd_address_watch_execute(struct kgd_dev *kgd,
87 unsigned int watch_point_id, 86 unsigned int watch_point_id,
@@ -99,7 +98,6 @@ static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd,
99 uint8_t vmid); 98 uint8_t vmid);
100static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd, 99static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
101 uint8_t vmid); 100 uint8_t vmid);
102static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid);
103static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type); 101static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);
104static void set_scratch_backing_va(struct kgd_dev *kgd, 102static void set_scratch_backing_va(struct kgd_dev *kgd,
105 uint64_t va, uint32_t vmid); 103 uint64_t va, uint32_t vmid);
@@ -157,7 +155,6 @@ static const struct kfd2kgd_calls kfd2kgd = {
157 get_atc_vmid_pasid_mapping_pasid, 155 get_atc_vmid_pasid_mapping_pasid,
158 .get_atc_vmid_pasid_mapping_valid = 156 .get_atc_vmid_pasid_mapping_valid =
159 get_atc_vmid_pasid_mapping_valid, 157 get_atc_vmid_pasid_mapping_valid,
160 .write_vmid_invalidate_request = write_vmid_invalidate_request,
161 .get_fw_version = get_fw_version, 158 .get_fw_version = get_fw_version,
162 .set_scratch_backing_va = set_scratch_backing_va, 159 .set_scratch_backing_va = set_scratch_backing_va,
163 .get_tile_config = get_tile_config, 160 .get_tile_config = get_tile_config,
@@ -707,13 +704,6 @@ static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,
707 return reg & ATC_VMID0_PASID_MAPPING__PASID_MASK; 704 return reg & ATC_VMID0_PASID_MAPPING__PASID_MASK;
708} 705}
709 706
710static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid)
711{
712 struct amdgpu_device *adev = (struct amdgpu_device *) kgd;
713
714 WREG32(mmVM_INVALIDATE_REQUEST, 1 << vmid);
715}
716
717static int kgd_address_watch_disable(struct kgd_dev *kgd) 707static int kgd_address_watch_disable(struct kgd_dev *kgd)
718{ 708{
719 return 0; 709 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 a6752bd0c871..94eab54864bf 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 {
258 uint16_t (*get_atc_vmid_pasid_mapping_pasid)( 258 uint16_t (*get_atc_vmid_pasid_mapping_pasid)(
259 struct kgd_dev *kgd, 259 struct kgd_dev *kgd,
260 uint8_t vmid); 260 uint8_t vmid);
261 void (*write_vmid_invalidate_request)(struct kgd_dev *kgd,
262 uint8_t vmid);
263 261
264 uint16_t (*get_fw_version)(struct kgd_dev *kgd, 262 uint16_t (*get_fw_version)(struct kgd_dev *kgd,
265 enum kgd_engine_type type); 263 enum kgd_engine_type type);