Skip to content

Commit 733965a

Browse files
fcui-amdalexdeucher
authored andcommitted
drm/amdkfd: init drm_client with funcs hook
otherwise drm_client_dev_unregister() would try to kfree(&adev->kfd.client). Fixes: 1819200 ("drm/amdkfd: Export DMABufs from KFD using GEM handles") Signed-off-by: Flora Cui <flora.cui@amd.com> Reviewed-by: Felix Kuehling <felix.kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent ab762f9 commit 733965a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work)
138138
amdgpu_device_gpu_recover(adev, NULL, &reset_context);
139139
}
140140

141+
static const struct drm_client_funcs kfd_client_funcs = {
142+
.unregister = drm_client_release,
143+
};
141144
void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
142145
{
143146
int i;
@@ -161,7 +164,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
161164
.enable_mes = adev->enable_mes,
162165
};
163166

164-
ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", NULL);
167+
ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", &kfd_client_funcs);
165168
if (ret) {
166169
dev_err(adev->dev, "Failed to init DRM client: %d\n", ret);
167170
return;

0 commit comments

Comments
 (0)