[PATCH v2 3/3] drm/amd/amdgpu: Enable ISP in amdgpu_discovery

[Mario Limonciello]

On 5/9/2024 14:35, Pratap Nirujogi wrote:
> Enable ISP for ISP V4.1.0 and V4.1.1 in amdgpu_discovery.
> 
> Signed-off-by: Pratap Nirujogi <pratap.nirujogi at amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 22 +++++++++++++++++++
>   1 file changed, 22 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 6586feab8c2c..82d064adaa49 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -107,6 +107,7 @@
>   #include "jpeg_v5_0_0.h"
>   
>   #include "amdgpu_vpe.h"
> +#include "amdgpu_isp.h"
>   
>   #define FIRMWARE_IP_DISCOVERY "amdgpu/ip_discovery.bin"
>   MODULE_FIRMWARE(FIRMWARE_IP_DISCOVERY);
> @@ -682,6 +683,10 @@ static void amdgpu_discovery_read_from_harvest_table(struct amdgpu_device *adev,
>   			adev->sdma.sdma_mask &=
>   				~(1U << harvest_info->list[i].number_instance);
>   			break;
> +		case ISP_HWID:
> +			adev->isp.harvest_config |=
> +				~(1U << harvest_info->list[i].number_instance);
> +			break;
>   		default:
>   			break;
>   		}
> @@ -2303,6 +2308,20 @@ static int amdgpu_discovery_set_umsch_mm_ip_blocks(struct amdgpu_device *adev)
>   	return 0;
>   }
>   
> +static int amdgpu_discovery_set_isp_ip_blocks(struct amdgpu_device *adev)
> +{
> +	switch (amdgpu_ip_version(adev, ISP_HWIP, 0)) {
> +	case IP_VERSION(4, 1, 0):
> +	case IP_VERSION(4, 1, 1):
> +		amdgpu_device_ip_block_add(adev, &isp_ip_block);
> +		break;
> +	default:
> +		break;
> +	}
> +
> +	return 0;
> +}
> +
>   int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>   {
>   	int r;
> @@ -2829,6 +2848,9 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
>   	if (r)
>   		return r;
>   
> +	r = amdgpu_discovery_set_isp_ip_blocks(adev);
> +	if (r)
> +		return r;
>   	return 0;
>   }
>