tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Early variants need an override.

Fixes: 57d00816c6a9 ("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)

Alex Deucher 31bc64e8 d6b99885

+6 -4
+1 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
··· 3090 3090 case IP_VERSION(11, 5, 1): 3091 3091 case IP_VERSION(11, 5, 2): 3092 3092 case IP_VERSION(11, 5, 3): 3093 - adev->family = AMDGPU_FAMILY_GC_11_5_0; 3094 - break; 3095 3093 case IP_VERSION(11, 5, 4): 3096 - adev->family = AMDGPU_FAMILY_GC_11_5_4; 3094 + adev->family = AMDGPU_FAMILY_GC_11_5_0; 3097 3095 break; 3098 3096 case IP_VERSION(12, 0, 0): 3099 3097 case IP_VERSION(12, 0, 1):
+5 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 1903 1903 goto error; 1904 1904 } 1905 1905 1906 - init_data.asic_id.chip_family = adev->family; 1906 + /* special handling for early revisions of GC 11.5.4 */ 1907 + if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 4)) 1908 + init_data.asic_id.chip_family = AMDGPU_FAMILY_GC_11_5_4; 1909 + else 1910 + init_data.asic_id.chip_family = adev->family; 1907 1911 1908 1912 init_data.asic_id.pci_revision_id = adev->pdev->revision; 1909 1913 init_data.asic_id.hw_internal_rev = adev->external_rev_id;