* [PATCH] drm/amd/display: properly handle family setting for early GC 11.5.4
@ 2026-04-23 16:42 Alex Deucher
2026-04-23 17:27 ` Mario Limonciello
0 siblings, 1 reply; 2+ messages in thread
From: Alex Deucher @ 2026-04-23 16:42 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Pratik Vishwakarma, Roman Li, Mario Limonciello
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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 +---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 31d85606d31b5..5dbe3d6963b9a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -3091,10 +3091,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):
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 3fa4dbda4517c..a8e6bf3e116e4 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1967,7 +1967,11 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
goto error;
}
- init_data.asic_id.chip_family = adev->family;
+ /* 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;
init_data.asic_id.hw_internal_rev = adev->external_rev_id;
--
2.53.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amd/display: properly handle family setting for early GC 11.5.4
2026-04-23 16:42 [PATCH] drm/amd/display: properly handle family setting for early GC 11.5.4 Alex Deucher
@ 2026-04-23 17:27 ` Mario Limonciello
0 siblings, 0 replies; 2+ messages in thread
From: Mario Limonciello @ 2026-04-23 17:27 UTC (permalink / raw)
To: Alex Deucher, amd-gfx; +Cc: Pratik Vishwakarma, Roman Li
On 4/23/26 11:42, Alex Deucher wrote:
> 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>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Tested-by: Mario Limonciello (AMD) <superm1@kernel.org>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 +---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++++-
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 31d85606d31b5..5dbe3d6963b9a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -3091,10 +3091,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):
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 3fa4dbda4517c..a8e6bf3e116e4 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1967,7 +1967,11 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
> goto error;
> }
>
> - init_data.asic_id.chip_family = adev->family;
> + /* 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;
> init_data.asic_id.hw_internal_rev = adev->external_rev_id;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-04-23 17:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-23 16:42 [PATCH] drm/amd/display: properly handle family setting for early GC 11.5.4 Alex Deucher
2026-04-23 17:27 ` Mario Limonciello
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox