[PATCH] drm/amdgpu: Fix Rv init failed

[Huang Rui]

On Tue, Sep 25, 2018 at 05:54:00PM +0800, Rex Zhu wrote:
> Partially revert:
> commit 91079a250cbe ("drm/amdgpu: Change the gfx/sdma init/fini sequence")'
> drm/amdgpu: Change the gfx/sdma init/fini sequence
> 
> Currently sdma ip is power up when smu hw init, so can't change
> the hw sequence on Rv.
> 
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>

Thanks.

Reviewed-by: Huang Rui <ray.huang at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index a741913..35b43de 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -551,8 +551,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  		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, &gfx_v9_0_ip_block);
> -		amdgpu_device_ip_block_add(adev, &sdma_v4_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);
> @@ -562,6 +560,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  #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;
>  	default:
> -- 
> 1.9.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx