Re: [Linaro-mm-sig] [PATCH 1/2] dma-buf/sync-file: fix logic error in new fence merge code

Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx> · Tue, 29 Mar 2022 09:07:00 +0200

For the series,

Reviewed-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>


On 3/29/22 09:00, 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@xxxxxxx>
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();
  
  	if (num_fences > index) {
  		struct dma_fence **tmp;






