[PATCH] drm/amd/display: Override DCN410 IP version

[Harry Wentland]

On 2024-04-30 09:23, Aurabindo Pillai wrote:
> 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 at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 2aad1ba0ab9d..87a2f15c8a64 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -1965,6 +1965,11 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
>  		case IP_VERSION(3, 2, 1):
>  		case IP_VERSION(3, 5, 0):
>  		case IP_VERSION(3, 5, 1):
> +		case IP_VERSION(4, 1, 0):

Doesn't this do more than override? Doesn't this enable IP
creation for DCN 4.1.0 in the first place?

It might make sense to split this into a separate patch
as it sounds like we'll want to revert the override at
some point in the future but not the IP creation.

Harry

> +			/* 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