dma-buf: Enable signaling on fence for selftests

Here's enabling software signaling on fence for selftest.

Signed-off-by: Arvind Yadav <Arvind.Yadav@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220914164321.2156-4-Arvind.Yadav@amd.com
Signed-off-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/dma-buf/st-dma-fence-chain.c b/drivers/dma-buf/st-dma-fence-chain.c
index 8ce1ea5..0a9b099 100644 (file)
--- a/drivers/dma-buf/st-dma-fence-chain.c
+++ b/drivers/dma-buf/st-dma-fence-chain.c
@@ -87,6 +87,8 @@ static int sanitycheck(void *arg)
        if (!chain)
                err = -ENOMEM;
 
+       dma_fence_enable_sw_signaling(chain);
+
        dma_fence_signal(f);
        dma_fence_put(f);
 
@@ -143,6 +145,8 @@ static int fence_chains_init(struct fence_chains *fc, unsigned int count,
                }
 
                fc->tail = fc->chains[i];
+
+               dma_fence_enable_sw_signaling(fc->chains[i]);
        }
 
        fc->chain_length = i;

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;

diff --git a/drivers/dma-buf/st-dma-fence.c b/drivers/dma-buf/st-dma-fence.c
index c8a12d7..fb6e0a6 100644 (file)
--- a/drivers/dma-buf/st-dma-fence.c
+++ b/drivers/dma-buf/st-dma-fence.c
@@ -102,6 +102,8 @@ static int sanitycheck(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_fence_signal(f);
        dma_fence_put(f);
 
@@ -117,6 +119,8 @@ static int test_signaling(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        if (dma_fence_is_signaled(f)) {
                pr_err("Fence unexpectedly signaled on creation\n");
                goto err_free;
@@ -190,6 +194,8 @@ static int test_late_add_callback(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_fence_signal(f);
 
        if (!dma_fence_add_callback(f, &cb.cb, simple_callback)) {
@@ -282,6 +288,8 @@ static int test_status(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        if (dma_fence_get_status(f)) {
                pr_err("Fence unexpectedly has signaled status on creation\n");
                goto err_free;
@@ -308,6 +316,8 @@ static int test_error(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_fence_set_error(f, -EIO);
 
        if (dma_fence_get_status(f)) {
@@ -337,6 +347,8 @@ static int test_wait(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        if (dma_fence_wait_timeout(f, false, 0) != -ETIME) {
                pr_err("Wait reported complete before being signaled\n");
                goto err_free;
@@ -379,6 +391,8 @@ static int test_wait_timeout(void *arg)
        if (!wt.f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(wt.f);
+
        if (dma_fence_wait_timeout(wt.f, false, 1) != -ETIME) {
                pr_err("Wait reported complete before being signaled\n");
                goto err_free;
@@ -458,6 +472,8 @@ static int thread_signal_callback(void *arg)
                        break;
                }
 
+               dma_fence_enable_sw_signaling(f1);
+
                rcu_assign_pointer(t->fences[t->id], f1);
                smp_wmb();
 

diff --git a/drivers/dma-buf/st-dma-resv.c b/drivers/dma-buf/st-dma-resv.c
index 813779e..15dbea1 100644 (file)
--- a/drivers/dma-buf/st-dma-resv.c
+++ b/drivers/dma-buf/st-dma-resv.c
@@ -45,6 +45,8 @@ static int sanitycheck(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_fence_signal(f);
        dma_fence_put(f);
 
@@ -69,6 +71,8 @@ static int test_signaling(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_resv_init(&resv);
        r = dma_resv_lock(&resv, NULL);
        if (r) {
@@ -114,6 +118,8 @@ static int test_for_each(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_resv_init(&resv);
        r = dma_resv_lock(&resv, NULL);
        if (r) {
@@ -173,6 +179,8 @@ static int test_for_each_unlocked(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_resv_init(&resv);
        r = dma_resv_lock(&resv, NULL);
        if (r) {
@@ -244,6 +252,8 @@ static int test_get_fences(void *arg)
        if (!f)
                return -ENOMEM;
 
+       dma_fence_enable_sw_signaling(f);
+
        dma_resv_init(&resv);
        r = dma_resv_lock(&resv, NULL);
        if (r) {