| From 04caaa9c34ae11eac4e15fe11f1b1e76275cb570 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 12 Jul 2024 11:07:40 +0800 |
| Subject: drm/amdgpu: fix NULL pointer issue buffer funcs |
| |
| From: Likun Gao <Likun.Gao@amd.com> |
| |
| [ Upstream commit 9877a865d62c9c3e0f4cc369dc9ca9f7f24f5ee9 ] |
| |
| If SDMA block not enabled, buffer_funcs will not initialize, |
| fix the null pointer issue if buffer_funcs not initialized. |
| |
| Signed-off-by: Likun Gao <Likun.Gao@amd.com> |
| Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| index 1cf90557b310b..cab75f5c9f2fd 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| @@ -2963,7 +2963,8 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) |
| if (r) |
| goto init_failed; |
| |
| - if (adev->mman.buffer_funcs_ring->sched.ready) |
| + if (adev->mman.buffer_funcs_ring && |
| + adev->mman.buffer_funcs_ring->sched.ready) |
| amdgpu_ttm_set_buffer_funcs_status(adev, true); |
| |
| /* Don't init kfd if whole hive need to be reset during init */ |
| -- |
| 2.51.0 |
| |
