[Intel-gfx] [PATCH 1/2] dma-buf/sync-file: fix logic error in new fence merge code

[Christian König]

Am 29.03.22 um 10:46 schrieb Daniel Vetter:
> On Tue, Mar 29, 2022 at 09:00:00AM +0200, Christian König wrote:
>> When the array is empty because everything is signaled we can't use
>> add_fence() to add something because that would filter the signaled
>> fence again.
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> Fixes: 519f490db07e ("dma-buf/sync-file: fix warning about fence containers")
>> ---
>>   drivers/dma-buf/sync_file.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
>> index b8dea4ec123b..514d213261df 100644
>> --- a/drivers/dma-buf/sync_file.c
>> +++ b/drivers/dma-buf/sync_file.c
>> @@ -262,7 +262,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,
>>   	}
>>   
>>   	if (index == 0)
>> -		add_fence(fences, &index, dma_fence_get_stub());
>> +		fences[index++] = dma_fence_get_stub();
> Uh idiot me wondered about this and somehow convinced myself that adding a
> random fences instead of a singalled stub is ok. I should have checked
> more carefully :-/

Well idiot me wanted to clean that up fully and move all of that into 
sync_file_set_fence(), but then I though "Na, that patch is for 
next-fixes, don't make it too complicate" and then changed the code 
anyway just out of habit.

Cheers,
Christian.

>
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
>
>>   
>>   	if (num_fences > index) {
>>   		struct dma_fence **tmp;
>> -- 
>> 2.25.1
>>