Merge branch 'for-6.3/logitech' into for-linus

[platform/kernel/linux-starfive.git] / drivers / dma-buf / st-dma-fence-unwrap.c

diff --git a/drivers/dma-buf/st-dma-fence-unwrap.c b/drivers/dma-buf/st-dma-fence-unwrap.c
index 4105d5e..f0cee98 100644 (file)
--- a/drivers/dma-buf/st-dma-fence-unwrap.c
+++ b/drivers/dma-buf/st-dma-fence-unwrap.c
@@ -102,6 +102,8 @@ static int sanitycheck(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        array = mock_array(1, f);
        if (!array)
                return -ENOMEM;
@@ -124,12 +126,16 @@ static int unwrap_array(void *arg)
        if (!f1)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f1);
+
        f2 = mock_fence();
        if (!f2) {
                dma_fence_put(f1);
                return -ENOMEM;
        }
 
+       dma_fence_enable_sw_signaling(f2);
+
        array = mock_array(2, f1, f2);
        if (!array)
                return -ENOMEM;
@@ -164,12 +170,16 @@ static int unwrap_chain(void *arg)
        if (!f1)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f1);
+
        f2 = mock_fence();
        if (!f2) {
                dma_fence_put(f1);
                return -ENOMEM;
        }
 
+       dma_fence_enable_sw_signaling(f2);
+
        chain = mock_chain(f1, f2);
        if (!chain)
                return -ENOMEM;
@@ -204,12 +214,16 @@ static int unwrap_chain_array(void *arg)
        if (!f1)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f1);
+
        f2 = mock_fence();
        if (!f2) {
                dma_fence_put(f1);
                return -ENOMEM;
        }
 
+       dma_fence_enable_sw_signaling(f2);
+
        array = mock_array(2, f1, f2);
        if (!array)
                return -ENOMEM;
@@ -248,12 +262,16 @@ static int unwrap_merge(void *arg)
        if (!f1)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f1);
+
        f2 = mock_fence();
        if (!f2) {
                err = -ENOMEM;
                goto error_put_f1;
        }
 
+       dma_fence_enable_sw_signaling(f2);
+
        f3 = dma_fence_unwrap_merge(f1, f2);
        if (!f3) {
                err = -ENOMEM;
@@ -296,10 +314,14 @@ static int unwrap_merge_complex(void *arg)
        if (!f1)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f1);
+
        f2 = mock_fence();
        if (!f2)
                goto error_put_f1;
 
+       dma_fence_enable_sw_signaling(f2);
+
        f3 = dma_fence_unwrap_merge(f1, f2);
        if (!f3)
                goto error_put_f2;