Re: [PATCH] drm/amdgpu: fix unload driver fail

2019-05-24 Thread Christian König

Am 24.05.19 um 11:52 schrieb Emily Deng:

dc_destroy should be called amdgpu_cgs_destroy_device,
as it will use cgs context to read or write registers.

Signed-off-by: Emily Deng 


Acked-by: Christian König 


---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ---
  1 file changed, 4 insertions(+), 3 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 fd04217..f558c9c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -616,6 +616,10 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
  static void amdgpu_dm_fini(struct amdgpu_device *adev)
  {
amdgpu_dm_destroy_drm_device(&adev->dm);
+
+   /* DC Destroy TODO: Replace destroy DAL */
+   if (adev->dm.dc)
+   dc_destroy(&adev->dm.dc);
/*
 * TODO: pageflip, vlank interrupt
 *
@@ -630,9 +634,6 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
mod_freesync_destroy(adev->dm.freesync_module);
adev->dm.freesync_module = NULL;
}
-   /* DC Destroy TODO: Replace destroy DAL */
-   if (adev->dm.dc)
-   dc_destroy(&adev->dm.dc);
  
  	mutex_destroy(&adev->dm.dc_lock);
  


___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH] drm/amdgpu: fix unload driver fail

2019-05-24 Thread Emily Deng
dc_destroy should be called amdgpu_cgs_destroy_device,
as it will use cgs context to read or write registers.

Signed-off-by: Emily Deng 
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ---
 1 file changed, 4 insertions(+), 3 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 fd04217..f558c9c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -616,6 +616,10 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 static void amdgpu_dm_fini(struct amdgpu_device *adev)
 {
amdgpu_dm_destroy_drm_device(&adev->dm);
+
+   /* DC Destroy TODO: Replace destroy DAL */
+   if (adev->dm.dc)
+   dc_destroy(&adev->dm.dc);
/*
 * TODO: pageflip, vlank interrupt
 *
@@ -630,9 +634,6 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
mod_freesync_destroy(adev->dm.freesync_module);
adev->dm.freesync_module = NULL;
}
-   /* DC Destroy TODO: Replace destroy DAL */
-   if (adev->dm.dc)
-   dc_destroy(&adev->dm.dc);
 
mutex_destroy(&adev->dm.dc_lock);
 
-- 
2.7.4

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx