[PATCH] drm/amdgpu: fix "move PD/PT bos on LRU again""

[Christian König]

Michel can you give this one a try as well?

If I'm not completely mistaken it should fix the LRU problems.

Christian.

Am 30.08.2018 um 13:51 schrieb Christian König:
> Fixes the LRU corruption, we accidentially tried to move things on the
> LRU after dropping the reservation lock.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +-
>   2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index dd734970e167..349dcc37ee64 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -1237,6 +1237,8 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
>   	ring = to_amdgpu_ring(entity->rq->sched);
>   	amdgpu_ring_priority_get(ring, priority);
>   
> +	amdgpu_vm_move_to_lru_tail(p->adev, &fpriv->vm);
> +
>   	ttm_eu_fence_buffer_objects(&p->ticket, &p->validated, p->fence);
>   	amdgpu_mn_unlock(p->mn);
>   
> @@ -1258,7 +1260,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>   	union drm_amdgpu_cs *cs = data;
>   	struct amdgpu_cs_parser parser = {};
>   	bool reserved_buffers = false;
> -	struct amdgpu_fpriv *fpriv;
>   	int i, r;
>   
>   	if (!adev->accel_working)
> @@ -1303,8 +1304,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>   
>   	r = amdgpu_cs_submit(&parser, cs);
>   
> -	fpriv = filp->driver_priv;
> -	amdgpu_vm_move_to_lru_tail(adev, &fpriv->vm);
>   out:
>   	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);
>   	return r;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 72f8c750e128..d74c331893f0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -1120,7 +1120,7 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev,
>   					   struct amdgpu_vm_bo_base,
>   					   vm_status);
>   		bo_base->moved = false;
> -		list_del_init(&bo_base->vm_status);
> +		list_move(&bo_base->vm_status, &vm->idle);
>   
>   		bo = bo_base->bo->parent;
>   		if (!bo)