[PATCH] drm/ttm: fix pipelined gutting for evictions v2

[Sierra Guiza, Alejandro (Alex)]

On 7/24/2020 10:01 AM, Felix Kuehling wrote:
> Am 2020-07-24 um 7:56 a.m. schrieb Christian König:
>> We can't pipeline that during eviction because the memory needs
>> to be available immediately.
>>
>> v2: fix how we cleanup the BOs resources
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
> Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>
>
> It would be good to get a Tested-by from Alex as well.
>
> Thanks,
>    Felix

Tested-by: Alex Sierra <alex.sierra at amd.com>

Regards,

Alex Sierra

>
>> ---
>>   drivers/gpu/drm/ttm/ttm_bo.c | 8 ++++++--
>>   1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>> index 0768a054a916..469aa93ea317 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -652,8 +652,12 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo,
>>   	placement.num_busy_placement = 0;
>>   	bdev->driver->evict_flags(bo, &placement);
>>   
>> -	if (!placement.num_placement && !placement.num_busy_placement)
>> -		return ttm_bo_pipeline_gutting(bo);
>> +	if (!placement.num_placement && !placement.num_busy_placement) {
>> +		ttm_bo_wait(bo, false, false);
>> +
>> +		ttm_bo_cleanup_memtype_use(bo);
>> +		return 0;
>> +	}
>>   
>>   	evict_mem = bo->mem;
>>   	evict_mem.mm_node = NULL;