[AMD Official Use Only - General]
Reviewed-by: Lijo Lazar <lijo.la...@amd.com>
Thanks,
Lijo
-----Original Message-----
From: Zhang, Hawking <hawking.zh...@amd.com>
Sent: Monday, January 22, 2024 3:27 PM
To: amd-gfx@lists.freedesktop.org; Lazar, Lijo <lijo.la...@amd.com>; Deucher,
Alexander <alexander.deuc...@amd.com>; Ma, Le <le...@amd.com>
Cc: Zhang, Hawking <hawking.zh...@amd.com>
Subject: [PATCH] drm/amdgpu: Fix null pointer dereference
amdgpu_reg_state_sysfs_fini could be invoked at the time when asic_func is even
not initialized, i.e., amdgpu_discovery_init fails for some reason.
Signed-off-by: Hawking Zhang <hawking.zh...@amd.com>
---
drivers/gpu/drm/amd/include/amdgpu_reg_state.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/include/amdgpu_reg_state.h
b/drivers/gpu/drm/amd/include/amdgpu_reg_state.h
index be519c8edf49..335980e2afbf 100644
--- a/drivers/gpu/drm/amd/include/amdgpu_reg_state.h
+++ b/drivers/gpu/drm/amd/include/amdgpu_reg_state.h
@@ -138,7 +138,7 @@ static inline size_t amdgpu_reginst_size(uint16_t num_inst,
size_t inst_size, }
#define amdgpu_asic_get_reg_state_supported(adev) \
- ((adev)->asic_funcs->get_reg_state ? 1 : 0)
+ (((adev)->asic_funcs && (adev)->asic_funcs->get_reg_state) ? 1 : 0)
#define amdgpu_asic_get_reg_state(adev, state, buf, size) \
((adev)->asic_funcs->get_reg_state ? \
--
2.17.1
