diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2017-05-22 01:11:15 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:07:29 -0400 |
commit | 21de3396b44a67429c6b6a3f2d697fb261c76054 (patch) | |
tree | a1ce9d63794512975739ab496c8f0a654c832281 | |
parent | c14833c6728e587d33777d416a9d0c21d3785ff8 (diff) |
drm/amd/display: call amdgpu_dm_fini when hw_fini.
to free up drm mode_config info.
fix issue: unload amdgpu, can't load amdgpu again.
[drm:drm_debugfs_init [drm]] *ERROR* Cannot create /sys/kernel/debug/dri/0
[drm:drm_minor_register [drm]] *ERROR* DRM: Failed to initialize /sys/kernel/debug/dri.
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Andrey Grodzovsky<andrey.grodzovsky@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 7e28f9870b86..74415fdf7ed8 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |||
@@ -395,9 +395,8 @@ void amdgpu_dm_fini(struct amdgpu_device *adev) | |||
395 | adev->dm.freesync_module = NULL; | 395 | adev->dm.freesync_module = NULL; |
396 | } | 396 | } |
397 | /* DC Destroy TODO: Replace destroy DAL */ | 397 | /* DC Destroy TODO: Replace destroy DAL */ |
398 | { | 398 | if (adev->dm.dc) |
399 | dc_destroy(&adev->dm.dc); | 399 | dc_destroy(&adev->dm.dc); |
400 | } | ||
401 | return; | 400 | return; |
402 | } | 401 | } |
403 | 402 | ||
@@ -490,7 +489,7 @@ static int dm_hw_fini(void *handle) | |||
490 | amdgpu_dm_hpd_fini(adev); | 489 | amdgpu_dm_hpd_fini(adev); |
491 | 490 | ||
492 | amdgpu_dm_irq_fini(adev); | 491 | amdgpu_dm_irq_fini(adev); |
493 | 492 | amdgpu_dm_fini(adev); | |
494 | return 0; | 493 | return 0; |
495 | } | 494 | } |
496 | 495 | ||
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 773f0efc449b..b428c7c6559b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c | |||
@@ -1541,7 +1541,12 @@ enum dc_irq_source dc_interrupt_to_irq_source( | |||
1541 | 1541 | ||
1542 | void dc_interrupt_set(const struct dc *dc, enum dc_irq_source src, bool enable) | 1542 | void dc_interrupt_set(const struct dc *dc, enum dc_irq_source src, bool enable) |
1543 | { | 1543 | { |
1544 | struct core_dc *core_dc = DC_TO_CORE(dc); | 1544 | struct core_dc *core_dc; |
1545 | |||
1546 | if (dc == NULL) | ||
1547 | return; | ||
1548 | core_dc = DC_TO_CORE(dc); | ||
1549 | |||
1545 | dal_irq_service_set(core_dc->res_pool->irqs, src, enable); | 1550 | dal_irq_service_set(core_dc->res_pool->irqs, src, enable); |
1546 | } | 1551 | } |
1547 | 1552 | ||