[PATCH 4/5] drm/amdgpu: simplify and fix amdgpu_sync_resv

[Felix Kuehling]

On 2020-01-30 7:49, Christian König wrote:
> No matter what we always need to sync to moves.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> Tested-by: Tom St Denis <tom.stdenis at amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 15 +++++++++++----
>   1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> index c124f64e7aae..9f42032676da 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> @@ -232,10 +232,19 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync,
>   
>   		f = rcu_dereference_protected(flist->shared[i],
>   					      dma_resv_held(resv));
> +
> +		fence_owner = amdgpu_sync_get_owner(f);
> +
> +		/* Always sync to moves, no matter what */
> +		if (fence_owner == AMDGPU_FENCE_OWNER_UNDEFINED) {
> +			r = amdgpu_sync_fence(sync, f, false);
> +			if (r)
> +				break;
> +		}
> +
>   		/* We only want to trigger KFD eviction fences on
>   		 * evict or move jobs. Skip KFD fences otherwise.
>   		 */
> -		fence_owner = amdgpu_sync_get_owner(f);
>   		if (fence_owner == AMDGPU_FENCE_OWNER_KFD &&
>   		    owner != AMDGPU_FENCE_OWNER_UNDEFINED)
>   			continue;
> @@ -265,9 +274,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync,
>   			break;
>   
>   		case AMDGPU_SYNC_EXPLICIT:
> -			if (owner != AMDGPU_FENCE_OWNER_UNDEFINED)
> -				continue;
> -			break;
> +			continue;
>   		}
>   
>   		r = amdgpu_sync_fence(sync, f, false);