Commit 58d9b9a1 authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amd/pm: parse pp_handle under appropriate conditions 

amdgpu_dpm_is_overdrive_supported is a common API across all
asics, so we should cast pp_handle into correct structure
under different power frameworks.

v2: using return directly to simplify code
v3: SI asic does not carry od_enabled member in pp_handle, and update Fixes tag

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2541


Fixes: eb4900aa ("drm/amdgpu: Fix kernel NULL pointer dereference in dpm functions")
Suggested-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent af7828fb

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

+13 −7
Original line number Diff line number Diff line
@@ -1460,15 +1460,21 @@ int amdgpu_dpm_get_smu_prv_buf_details(struct amdgpu_device *adev, 


int amdgpu_dpm_is_overdrive_supported(struct amdgpu_device *adev)

{

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

	if (is_support_sw_smu(adev)) {

		struct smu_context *smu = adev->powerplay.pp_handle;



	if ((is_support_sw_smu(adev) && smu->od_enabled) ||

	    (is_support_sw_smu(adev) && smu->is_apu) ||

		(!is_support_sw_smu(adev) && hwmgr->od_enabled))

		return true;

		return (smu->od_enabled || smu->is_apu);

	} else {

		struct pp_hwmgr *hwmgr;



		/* SI asic does not carry od_enabled */

		if (adev->family == AMDGPU_FAMILY_SI)

			return false;



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



		return hwmgr->od_enabled;

	}

}



int amdgpu_dpm_set_pp_table(struct amdgpu_device *adev,