drm/amd/pp: Add smu irq handlers in sw_init instand of hw_init

Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Rex Zhu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 038131704d2478c8fd3a216124ede01c68dc26d6..7e8ad30d98e2a56e26ec6ae5ab32279f546452db 100644 (file)
--- 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 bafcfd2cf156a32e782fd0c7f12abda1c2f67b10..42982055b161810890ca01bc5d1737a1a5468239 100644 (file)
--- 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)