From: Rex Zhu <Rex.Zhu@amd.com>
Date: Wed, 21 Mar 2018 13:10:11 +0800
Subject: drm/amd/pp: Add smu irq handlers in sw_init instand of hw_init
Git-commit: 3296c4ae9769cab837799c0f873a1b281f4a156e
Patch-mainline: v4.17-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 ++
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -117,6 +117,8 @@ static int pp_sw_init(void *handle)
ret = hwmgr->smumgr_funcs->smu_init(hwmgr);
+ phm_register_irq_handlers(hwmgr);
+
pr_debug("amdgpu: powerplay sw initialized\n");
}
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -206,10 +206,6 @@ int hwmgr_hw_init(struct pp_hwmgr *hwmgr
if (ret)
goto err2;
- ret = phm_register_irq_handlers(hwmgr);
- if (ret)
- goto err2;
-
return 0;
err2:
if (hwmgr->hwmgr_func->backend_fini)