[PATCH v4] drm/amdgpu/sriov: Only sriov runtime support use kiq

[Christian König]

Am 21.08.2018 um 12:03 schrieb Emily Deng:
> Use adev->gfx.kiq.ring.ready directly.
>
> For sriov, don't use kiq in exclusive mode, as don't know how long time
> it will take, some times it will occur exclusive timeout.
>
> Signed-off-by: Emily Deng <Emily.Deng at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 15 ++++++++-------
>   1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index f71615e..eec991f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -320,9 +320,6 @@ signed long  amdgpu_kiq_reg_write_reg_wait(struct amdgpu_device *adev,
>   	struct amdgpu_kiq *kiq = &adev->gfx.kiq;
>   	struct amdgpu_ring *ring = &kiq->ring;
>   
> -	if (!ring->ready)
> -		return -EINVAL;
> -
>   	spin_lock_irqsave(&kiq->ring_lock, flags);
>   
>   	amdgpu_ring_alloc(ring, 32);
> @@ -389,10 +386,14 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev,
>   		struct amdgpu_vmhub *hub = &adev->vmhub[i];
>   		u32 tmp = gmc_v9_0_get_invalidate_req(vmid);
>   
> -		r = amdgpu_kiq_reg_write_reg_wait(adev, hub->vm_inv_eng0_req + eng,
> -			hub->vm_inv_eng0_ack + eng, tmp, 1 << vmid);
> -		if (!r)
> -			continue;
> +		if (adev->gfx.kiq.ring.ready &&
> +		    (amdgpu_sriov_runtime(adev) ||
> +		     !amdgpu_sriov_vf(adev))) {
> +			r = amdgpu_kiq_reg_write_reg_wait(adev, hub->vm_inv_eng0_req + eng,
> +				hub->vm_inv_eng0_ack + eng, tmp, 1 << vmid);
> +			if (!r)
> +				continue;
> +		}
>   
>   		spin_lock(&adev->gmc.invalidate_lock);
>