summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong Zhao <Yong.Zhao@amd.com>2019-01-22 20:09:17 -0500
committerAlex Deucher <alexander.deucher@amd.com>2019-10-03 09:11:01 -0500
commit424b5442a2a67ba369839455c3b1fb1b00c6d861 (patch)
tree0daaf3f7e4d5faae8371cd2ddee9db879f909e1c
parent89b0679bd8cffbf11b6c1def984c83e837c4a43f (diff)
downloadlinux-stable-424b5442a2a67ba369839455c3b1fb1b00c6d861.tar.gz
linux-stable-424b5442a2a67ba369839455c3b1fb1b00c6d861.tar.bz2
linux-stable-424b5442a2a67ba369839455c3b1fb1b00c6d861.zip
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 Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c10
1 files 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 5e88c0fa7a0d..33a6bb5cf730 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -902,12 +902,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;
}