Commit 5247f05e authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amd/pm: avoid potential UBSAN issue on legacy asics 



Prevent further dpm casting on legacy asics without od_enabled in
amdgpu_dpm_is_overdrive_supported. This can avoid UBSAN complain
in init sequence.

v2: add a macro to check legacy dpm instead of checking asic family/type
v3: refine macro name for naming consistency

Suggested-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 8b229ada

drivers/gpu/drm/amd/pm/amdgpu_dpm.c

+7 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#define amdgpu_dpm_enable_bapm(adev, e) \

		((adev)->powerplay.pp_funcs->enable_bapm((adev)->powerplay.pp_handle, (e)))



#define amdgpu_dpm_is_legacy_dpm(adev) ((adev)->powerplay.pp_handle == (adev))



int amdgpu_dpm_get_sclk(struct amdgpu_device *adev, bool low)

{

	const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
@@ -1467,8 +1469,11 @@ int amdgpu_dpm_is_overdrive_supported(struct amdgpu_device *adev) 
	} else {

		struct pp_hwmgr *hwmgr;



		/* SI asic does not carry od_enabled */

		if (adev->family == AMDGPU_FAMILY_SI)

		/*

		 * dpm on some legacy asics don't carry od_enabled member

		 * as its pp_handle is casted directly from adev.

		 */

		if (amdgpu_dpm_is_legacy_dpm(adev))

			return false;



		hwmgr = (struct pp_hwmgr *)adev->powerplay.pp_handle;