diff options
| author | Rex Zhu <Rex.Zhu@amd.com> | 2018-03-21 13:10:11 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-03-21 14:36:59 -0500 |
| commit | 3296c4ae9769cab837799c0f873a1b281f4a156e (patch) | |
| tree | 96efd6d5c73c29835d7ab4f6863f2684c0a111dd /drivers | |
| parent | 4d2003721c2bd6add6746426eec1d879432c92dd (diff) | |
| download | linux-3296c4ae9769cab837799c0f873a1b281f4a156e.tar.gz linux-3296c4ae9769cab837799c0f873a1b281f4a156e.tar.bz2 linux-3296c4ae9769cab837799c0f873a1b281f4a156e.zip | |
drm/amd/pp: Add smu irq handlers in sw_init instand of hw_init
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 | ||||
| -rw-r--r-- | 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 038131704d24..7e8ad30d98e2 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 bafcfd2cf156..42982055b161 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) |