drm/amdgpu: update the handle ptr in early_fini

Update the *handle to amdgpu_ip_block ptr for all
functions pointers of early_fini.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 14bffa031786c42d3ea06ff2f6dc712e7d03852c..d0d073441422d8baef917f8483fc113a81f89ef6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3305,7 +3305,7 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev)
                if (!adev->ip_blocks[i].version->funcs->early_fini)
                        continue;
 
-               r = adev->ip_blocks[i].version->funcs->early_fini((void *)adev);
+               r = adev->ip_blocks[i].version->funcs->early_fini(&adev->ip_blocks[i]);
                if (r) {
                        DRM_DEBUG("early_fini of IP block <%s> failed %d\n",
                                  adev->ip_blocks[i].version->funcs->name, r);

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 9a1712673289907c535b17b54a8c82ee313884b5..e222062e8db092128a17fae85e3045ed84c20642 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2115,9 +2115,9 @@ error:
        return -EINVAL;
 }
 
-static int amdgpu_dm_early_fini(void *handle)
+static int amdgpu_dm_early_fini(struct amdgpu_ip_block *ip_block)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
 
        amdgpu_dm_audio_fini(adev);
 

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 4a10a804f13039f3f9f8d34f8ac03d4e5f69b407..980a6a740689b4ae0cca3c4857d96e6a6c571534 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -383,7 +383,7 @@ struct amd_ip_funcs {
        int (*late_init)(struct amdgpu_ip_block *ip_block);
        int (*sw_init)(struct amdgpu_ip_block *ip_block);
        int (*sw_fini)(struct amdgpu_ip_block *ip_block);
-       int (*early_fini)(void *handle);
+       int (*early_fini)(struct amdgpu_ip_block *ip_block);
        int (*hw_init)(void *handle);
        int (*hw_fini)(void *handle);
        void (*late_fini)(void *handle);