Commit 0e48f27d authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Adjust ASPM support quirk to cover more Intel hosts 

Some of the same issues identified in commit c770ef19
("drm/amd/amdgpu: disable ASPM in some situations") also affect
Tiger Lake systems with GFX11 connected over USB4. Widen the net
to also match these hosts.

Fixes: d9b3a066 ("drm/amd: Exclude dGPUs in eGPU enclosures from DPM quirks")
Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5145


Reviewed-by: default avatarYang Wang <kevinyang.wang@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 0a214d888485b9f35fe03882a92962e6d5697849)
parent 49ed6f45

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

+3 −6
Original line number Diff line number Diff line
@@ -1334,18 +1334,15 @@ static bool amdgpu_device_aspm_support_quirk(struct amdgpu_device *adev) 
#if IS_ENABLED(CONFIG_X86)

	struct cpuinfo_x86 *c = &cpu_data(0);



	if (!(amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 0) ||

		  amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 1)))

		return false;



	if (c->x86 == 6 &&

		adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5) {

	if (c->x86_vendor == X86_VENDOR_INTEL) {

		switch (c->x86_model) {

		case VFM_MODEL(INTEL_ALDERLAKE):

		case VFM_MODEL(INTEL_ALDERLAKE_L):

		case VFM_MODEL(INTEL_RAPTORLAKE):

		case VFM_MODEL(INTEL_RAPTORLAKE_P):

		case VFM_MODEL(INTEL_RAPTORLAKE_S):

		case VFM_MODEL(INTEL_TIGERLAKE):

		case VFM_MODEL(INTEL_TIGERLAKE_L):

			return true;

		default:

			return false;