1 files changed, 113 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2873-amd-amdkfd-Remove-unused-functions-write_vmid_invali.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2873-amd-amdkfd-Remove-unused-functions-write_vmid_invali.patch
new file mode 100644
index 00000000..c2bed5b8
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2873-amd-amdkfd-Remove-unused-functions-write_vmid_invali.patch
@@ -0,0 +1,113 @@
+From d7a1c6446fa5b9449f3ba008627bcf05b095bd79 Mon Sep 17 00:00:00 2001
+From: Yong Zhao <yong.zhao@amd.com>
+Date: Wed, 6 Dec 2017 09:28:32 -0500
+Subject: [PATCH 2873/4131] amd/amdkfd: Remove unused functions
+ write_vmid_invalidate_request()
+
+Change-Id: I8573de38dee475c3e449f57d4af0477c3aa64250
+Signed-off-by: Yong Zhao <yong.zhao@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 9 ---------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 9 ---------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 ---
+ 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 30480c8..c12803d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+@@ -146,7 +146,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 int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid);
+ static void set_num_of_requests(struct kgd_dev *dev, uint8_t num_of_req);
+ static int alloc_memory_of_scratch(struct kgd_dev *kgd,
+@@ -216,7 +215,6 @@ static const struct kfd2kgd_calls kfd2kgd = {
+ 	.get_atc_vmid_pasid_mapping_valid =
+ 			get_atc_vmid_pasid_mapping_valid,
+ 	.read_vmid_from_vmfault_reg = read_vmid_from_vmfault_reg,
+-	.write_vmid_invalidate_request = write_vmid_invalidate_request,
+ 	.invalidate_tlbs = invalidate_tlbs,
+ 	.sync_memory = amdgpu_amdkfd_gpuvm_sync_memory,
+ 	.alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,
+@@ -838,13 +836,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 invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid)
+ {
+ 	struct amdgpu_device *adev = (struct amdgpu_device *) kgd;
+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 b8d2ddd..83f9196 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+@@ -119,7 +119,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 void set_num_of_requests(struct kgd_dev *kgd,
+ 			uint8_t num_of_requests);
+ static int alloc_memory_of_scratch(struct kgd_dev *kgd,
+@@ -189,7 +188,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,
+ 	.invalidate_tlbs = invalidate_tlbs,
+ 	.sync_memory = amdgpu_amdkfd_gpuvm_sync_memory,
+ 	.alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,
+@@ -777,13 +775,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);
+-}
+-
+ /*
+  * FIXME: Poliars test failed with this package, FIJI works fine
+  * From the CP spec it does not official support the invalidation
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
+index 99965aa..59ceb73 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
+@@ -138,7 +138,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 uint32_t get_watch_base_addr(struct amdgpu_device *adev);
+ static int kgd_address_watch_disable(struct kgd_dev *kgd);
+ static int kgd_address_watch_execute(struct kgd_dev *kgd,
+@@ -157,7 +156,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 void set_num_of_requests(struct kgd_dev *kgd,
+ 			uint8_t num_of_requests);
+ static int alloc_memory_of_scratch(struct kgd_dev *kgd,
+@@ -234,7 +232,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,
+ 	.invalidate_tlbs = invalidate_tlbs,
+ 	.sync_memory = amdgpu_amdkfd_gpuvm_sync_memory,
+ 	.alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,
+-- 
+2.7.4
+