Commit 5d1eb4c4 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Move helper for dynamic speed switch check out of smu13 



This helper is used for checking if the connected host supports
the feature, it can be moved into generic code to be used by other
smu implementations as well.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3ebfa943

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

bool amdgpu_device_need_post(struct amdgpu_device *adev);

bool amdgpu_device_pcie_dynamic_switching_supported(void);

bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);

bool amdgpu_device_aspm_support_quirk(void);

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

+19 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,25 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev) 
	return true;

}



/*

 * Intel hosts such as Raptor Lake and Sapphire Rapids don't support dynamic

 * speed switching. Until we have confirmation from Intel that a specific host

 * supports it, it's safer that we keep it disabled for all.

 *

 * https://edc.intel.com/content/www/us/en/design/products/platforms/details/raptor-lake-s/13th-generation-core-processors-datasheet-volume-1-of-2/005/pci-express-support/

 * https://gitlab.freedesktop.org/drm/amd/-/issues/2663

 */

bool amdgpu_device_pcie_dynamic_switching_supported(void)

{

#if IS_ENABLED(CONFIG_X86)

	struct cpuinfo_x86 *c = &cpu_data(0);



	if (c->x86_vendor == X86_VENDOR_INTEL)

		return false;

#endif

	return true;

}



/**

 * amdgpu_device_should_use_aspm - check if the device should program ASPM

 *

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

+1 −20
Original line number Diff line number Diff line
@@ -2425,25 +2425,6 @@ int smu_v13_0_mode1_reset(struct smu_context *smu) 
	return ret;

}



/*

 * Intel hosts such as Raptor Lake and Sapphire Rapids don't support dynamic

 * speed switching. Until we have confirmation from Intel that a specific host

 * supports it, it's safer that we keep it disabled for all.

 *

 * https://edc.intel.com/content/www/us/en/design/products/platforms/details/raptor-lake-s/13th-generation-core-processors-datasheet-volume-1-of-2/005/pci-express-support/

 * https://gitlab.freedesktop.org/drm/amd/-/issues/2663

 */

static bool smu_v13_0_is_pcie_dynamic_switching_supported(void)

{

#if IS_ENABLED(CONFIG_X86)

	struct cpuinfo_x86 *c = &cpu_data(0);



	if (c->x86_vendor == X86_VENDOR_INTEL)

		return false;

#endif

	return true;

}



int smu_v13_0_update_pcie_parameters(struct smu_context *smu,

				     uint32_t pcie_gen_cap,

				     uint32_t pcie_width_cap)
@@ -2455,7 +2436,7 @@ int smu_v13_0_update_pcie_parameters(struct smu_context *smu, 
	uint32_t smu_pcie_arg;

	int ret, i;



	if (!smu_v13_0_is_pcie_dynamic_switching_supported()) {

	if (!amdgpu_device_pcie_dynamic_switching_supported()) {

		if (pcie_table->pcie_gen[num_of_levels - 1] < pcie_gen_cap)

			pcie_gen_cap = pcie_table->pcie_gen[num_of_levels - 1];