[PATCH] drm/amdgpu/soc15: clean up picasso support

[PATCH] drm/amdgpu/soc15: clean up picasso support

[Alex Deucher]

It's the same as raven so remove the duplicate case.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index f5a44d1fe5da..f930e09071d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -546,23 +546,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 		amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
 		break;
 	case CHIP_RAVEN:
-		amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
-		amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
-		amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
-		amdgpu_device_ip_block_add(adev, &psp_v10_0_ip_block);
-		amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
-		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
-			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
-#if defined(CONFIG_DRM_AMD_DC)
-		else if (amdgpu_device_has_dc_support(adev))
-			amdgpu_device_ip_block_add(adev, &dm_ip_block);
-#else
-#	warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
-#endif
-		amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
-		amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
-		amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block);
-		break;
 	case CHIP_PICASSO:
 		amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
 		amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
-- 
2.13.6

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu/soc15: clean up picasso support

[Huang Rui]

On Thu, Sep 13, 2018 at 03:07:57PM -0500, Alex Deucher wrote:
> It's the same as raven so remove the duplicate case.
> 
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/soc15.c | 17 -----------------
>  1 file changed, 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index f5a44d1fe5da..f930e09071d4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -546,23 +546,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  		amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
>  		break;
>  	case CHIP_RAVEN:
> -		amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
> -		amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
> -		amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
> -		amdgpu_device_ip_block_add(adev, &psp_v10_0_ip_block);
> -		amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
> -		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
> -			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
> -#if defined(CONFIG_DRM_AMD_DC)
> -		else if (amdgpu_device_has_dc_support(adev))
> -			amdgpu_device_ip_block_add(adev, &dm_ip_block);
> -#else
> -#	warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
> -#endif
> -		amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
> -		amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
> -		amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block);
> -		break;
>  	case CHIP_PICASSO:
>  		amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
>  		amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
> -- 
> 2.13.6
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx