]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amd: Override DCN410 IP version
authorAurabindo Pillai <aurabindo.pillai@amd.com>
Tue, 30 Apr 2024 19:35:36 +0000 (15:35 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 2 May 2024 19:48:46 +0000 (15:48 -0400)
Override DCN IP version to 4.0.1 from 4.1.0 temporarily until change is
made in DC codebase to use 4.1.0

Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

index d7f948e84e4fbd0f485d02e36ccdc9cbd970e92c..d6a1b262236d50826b6f4db20fa7390ae7ef5e31 100644 (file)
@@ -1966,6 +1966,10 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
                case IP_VERSION(3, 5, 0):
                case IP_VERSION(3, 5, 1):
                case IP_VERSION(4, 1, 0):
+                       /* TODO: Fix IP version. DC code expects version 4.0.1 */
+                       if (adev->ip_versions[DCE_HWIP][0] == IP_VERSION(4, 1, 0))
+                               adev->ip_versions[DCE_HWIP][0] = IP_VERSION(4, 0, 1);
+
                        if (amdgpu_sriov_vf(adev))
                                amdgpu_discovery_set_sriov_display(adev);
                        else