1 files changed, 46 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3904-drm-amdkfd-Remove-unnecessary-pm_init-for-non-HWS-mo.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3904-drm-amdkfd-Remove-unnecessary-pm_init-for-non-HWS-mo.patch
new file mode 100644
index 00000000..1dc40ba0
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3904-drm-amdkfd-Remove-unnecessary-pm_init-for-non-HWS-mo.patch
@@ -0,0 +1,46 @@
+From 1ca224f36a896a2ae19c584ab2ee769125a0e66f Mon Sep 17 00:00:00 2001
+From: Yong Zhao <Yong.Zhao@amd.com>
+Date: Tue, 22 Jan 2019 20:09:17 -0500
+Subject: [PATCH 3904/4256] drm/amdkfd: Remove unnecessary pm_init() for non
+ HWS mode
+
+The packet manager is not needed for non HWS mode except Hawaii, so only
+initialize it for Hawaii under non HWS mode. This will simplify debugging
+under non HWS mode for all new asics, because it eliminates one variable
+out of the equation in non HWS mode
+
+Change-Id: Ie2b61b546299a50366b9ab97900f4bb13de33d5b
+Signed-off-by: Yong Zhao <Yong.Zhao@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+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 787b936a026d..62c612cff26b 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+@@ -985,12 +985,18 @@ static void uninitialize(struct device_queue_manager *dqm)
+ static int start_nocpsch(struct device_queue_manager *dqm)
+ {
+ 	init_interrupts(dqm);
+-	return pm_init(&dqm->packets, dqm);
++	
++	if (dqm->dev->device_info->asic_family == CHIP_HAWAII)
++		return pm_init(&dqm->packets, dqm);
++	
++	return 0;
+ }
+ 
+ static int stop_nocpsch(struct device_queue_manager *dqm)
+ {
+-	pm_uninit(&dqm->packets);
++	if (dqm->dev->device_info->asic_family == CHIP_HAWAII)
++		pm_uninit(&dqm->packets);
++	
+ 	return 0;
+ }
+ 
+-- 
+2.17.1
+