1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From c3b413275c02128805cf2b85adc53d4f42fb2974 Mon Sep 17 00:00:00 2001
From: Rex Zhu <Rex.Zhu@amd.com>
Date: Mon, 22 May 2017 13:11:15 +0800
Subject: [PATCH 0459/4131] 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>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++---
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 ec68463..1d085f8 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)
adev->dm.freesync_module = NULL;
}
/* DC Destroy TODO: Replace destroy DAL */
- {
+ if (adev->dm.dc)
dc_destroy(&adev->dm.dc);
- }
return;
}
@@ -490,7 +489,7 @@ static int dm_hw_fini(void *handle)
amdgpu_dm_hpd_fini(adev);
amdgpu_dm_irq_fini(adev);
-
+ amdgpu_dm_fini(adev);
return 0;
}
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 773f0ef..b428c7c 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(
void dc_interrupt_set(const struct dc *dc, enum dc_irq_source src, bool enable)
{
- struct core_dc *core_dc = DC_TO_CORE(dc);
+ struct core_dc *core_dc;
+
+ if (dc == NULL)
+ return;
+ core_dc = DC_TO_CORE(dc);
+
dal_irq_service_set(core_dc->res_pool->irqs, src, enable);
}
--
2.7.4
|
