1 files changed, 52 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2709-drm-amdkfd-Delete-a-duplicate-statement-in-set_pasid.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2709-drm-amdkfd-Delete-a-duplicate-statement-in-set_pasid.patch
new file mode 100644
index 00000000..797117e7
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2709-drm-amdkfd-Delete-a-duplicate-statement-in-set_pasid.patch
@@ -0,0 +1,52 @@
+From 909e8be249163ce86d39d9aed12656dd89a60282 Mon Sep 17 00:00:00 2001
+From: Yong Zhao <Yong.Zhao@amd.com>
+Date: Sun, 14 Oct 2018 16:25:07 -0400
+Subject: [PATCH 2709/2940] drm/amdkfd: Delete a duplicate statement in
+ set_pasid_vmid_mapping()
+
+The same statement is later done in kgd_set_pasid_vmid_mapping(), so no
+need to do it in set_pasid_vmid_mapping().
+
+Signed-off-by: Yong Zhao <Yong.Zhao@amd.com>
+Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdkfd/cik_regs.h                 | 2 --
+ drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +--------
+ 2 files changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdkfd/cik_regs.h b/drivers/gpu/drm/amd/amdkfd/cik_regs.h
+index 37ce6dd65391..8e2a1663c4db 100644
+--- a/drivers/gpu/drm/amd/amdkfd/cik_regs.h
++++ b/drivers/gpu/drm/amd/amdkfd/cik_regs.h
+@@ -68,6 +68,4 @@
+ 
+ #define GRBM_GFX_INDEX					0x30800
+ 
+-#define	ATC_VMID_PASID_MAPPING_VALID			(1U << 31)
+-
+ #endif
+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 dfd8f9e5dd95..fb9d66ea13b7 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+@@ -846,15 +846,8 @@ static int
+ set_pasid_vmid_mapping(struct device_queue_manager *dqm, unsigned int pasid,
+ 			unsigned int vmid)
+ {
+-	uint32_t pasid_mapping;
+-
+-	pasid_mapping = (pasid == 0) ? 0 :
+-		(uint32_t)pasid |
+-		ATC_VMID_PASID_MAPPING_VALID;
+-
+ 	return dqm->dev->kfd2kgd->set_pasid_vmid_mapping(
+-						dqm->dev->kgd, pasid_mapping,
+-						vmid);
++						dqm->dev->kgd, pasid, vmid);
+ }
+ 
+ static void init_interrupts(struct device_queue_manager *dqm)
+-- 
+2.17.1
+