drm/amdkfd: init drm_client with funcs hook
Subsystems (3)
PATCH 1/1 drm/amdkfd: init drm_client with funcs hook
otherwise drm_client_dev_unregister() would try to kfree(&adev->kfd.client).
Signed-off-by Flora Cui <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4 -1
@@ -138,6 +138,9 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work)amdgpu_device_gpu_recover (adev,NULL , &reset_context); } +static const struct drm_client_funcs kfd_client_funcs = { + .unregister = drm_client_release, +};void amdgpu_amdkfd_device_init (struct amdgpu_device *adev) {int i;
@@ -161,7 +164,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) .enable_mes = adev->enable_mes, }; - ret =drm_client_init (&adev->ddev, &adev->kfd.client,"kfd" ,NULL ); + ret =drm_client_init (&adev->ddev, &adev->kfd.client,"kfd" , &kfd_client_funcs);if (ret) {dev_err (adev->dev,"Failed to init DRM client: %d\n" , ret);return ;
Signature · 1 line
2.34.1
[AMD Official Use Only - General]
Ping?
-----Original Message-----
From: Cui, Flora <[email protected]>
Sent: Friday, January 12, 2024 4:05 PM
To: [email protected]
Cc: Cui, Flora <[email protected]>
Subject: [PATCH] drm/amdkfd: init drm_client with funcs hook
otherwise drm_client_dev_unregister() would try to kfree(&adev->kfd.client).
Signed-off-by Flora Cui <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4 -1
@@ -138,6 +138,9 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work)amdgpu_device_gpu_recover (adev,NULL , &reset_context); } +static const struct drm_client_funcs kfd_client_funcs = { + .unregister = drm_client_release, +};void amdgpu_amdkfd_device_init (struct amdgpu_device *adev) {int i;
@@ -161,7 +164,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) .enable_mes = adev->enable_mes, }; - ret =drm_client_init (&adev->ddev, &adev->kfd.client,"kfd" ,NULL ); + ret =drm_client_init (&adev->ddev, &adev->kfd.client,"kfd" , &kfd_client_funcs);if (ret) {dev_err (adev->dev,"Failed to init DRM client: %d\n" , ret);return ;
--
2.34.1
Quoted 4 lines · Flora Cui
otherwise
drm_client_dev_unregister()would try tokfree(&adev->kfd.client).Signed-off-by Flora Cui <[email protected]>
Thank you for finding and fixing this bug. You can add:
Fixes 1819200166ce ("drm/amdkfd: Export DMABufs from KFD using GEM handles")
Reviewed-by Felix Kuehling <[email protected]>
Quoted 27 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4
-1@@ -138,6 +138,9 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work)amdgpu_device_gpu_recover (adev,NULL , &reset_context); } +static const struct drm_client_funcs kfd_client_funcs = { + .unregister = drm_client_release, +};void amdgpu_amdkfd_device_init (struct amdgpu_device *adev) {int i;@@ -161,7 +164,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) .enable_mes = adev->enable_mes, }; - ret =drm_client_init (&adev->ddev, &adev->kfd.client,"kfd" ,NULL ); + ret =drm_client_init (&adev->ddev, &adev->kfd.client,"kfd" , &kfd_client_funcs);if (ret) {dev_err (adev->dev,"Failed to init DRM client: %d\n" , ret);return ;