Commit 31bc64e8 authored Apr 23, 2026 by Alex Deucher

drm/amd/display: properly handle family setting for early GC 11.5.4



Early variants need an override.

Fixes: 57d00816 ("drm/amdgpu: set family for GC 11.5.4")
Cc: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
Cc: Roman Li <Roman.Li@amd.com>
Cc: Mario Limonciello <superm1@kernel.org>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Tested-by: Mario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 922fccc2d3f8186008c19ba08a49ae8a9463cb50)

parent d6b99885

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -3090,10 +3090,8 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
		case IP_VERSION(11, 5, 1):
		case IP_VERSION(11, 5, 2):
		case IP_VERSION(11, 5, 3):
		adev->family = AMDGPU_FAMILY_GC_11_5_0;
		break;
		case IP_VERSION(11, 5, 4):
		adev->family = AMDGPU_FAMILY_GC_11_5_4;
		adev->family = AMDGPU_FAMILY_GC_11_5_0;
		break;
		case IP_VERSION(12, 0, 0):
		case IP_VERSION(12, 0, 1):

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1903,6 +1903,10 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
		goto error;
		}

		/* special handling for early revisions of GC 11.5.4 */
		if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 4))
		init_data.asic_id.chip_family = AMDGPU_FAMILY_GC_11_5_4;
		else
		init_data.asic_id.chip_family = adev->family;

		init_data.asic_id.pci_revision_id = adev->pdev->revision;