From 506780f1648584286dc03258d65b54ff4c25b1e3 Mon Sep 17 00:00:00 2001 From: Rex Zhu Date: Wed, 21 Mar 2018 13:10:11 +0800 Subject: [PATCH 3901/4131] drm/amd/pp: Add smu irq handlers in sw_init instand of hw_init Change-Id: Id72b494fd9ff393f1798e2afd46e896c4707ada0 Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu --- 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(-) diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 7553ac7..93f5217 100644 --- 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"); } diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index bafcfd2..4298205 100644 --- 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) -- 2.7.4