Mesa (staging/20.2): iris: fix the order of src and dst for fence memcpy

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: 5afe855fde20f45a3e8d7e2b4781efbf9b15a7f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5afe855fde20f45a3e8d7e2b4781efbf9b15a7f7

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Fri Oct 23 13:25:39 2020 +0300

iris: fix the order of src and dst for fence memcpy

This fixes random failures with "deqp-egl --deqp-case=*multithread*":
   iris: Failed to submit batchbuffer: No such file or directory

Fixes: 6b1a56b908e ("iris: Drop stale syncobj references in fence_server_sync")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7289>
(cherry picked from commit cb6ce4a265ba64c172829a3d6d2e13a7d920133d)

---

 .pick_status.json                     | 2 +-
 src/gallium/drivers/iris/iris_fence.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index dbf617eb5d7..37ecee0a0af 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -940,7 +940,7 @@
         "description": "iris: fix the order of src and dst for fence memcpy",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "6b1a56b908e702c06f55c63b19b695a47f607456"
     },
diff --git a/src/gallium/drivers/iris/iris_fence.c b/src/gallium/drivers/iris/iris_fence.c
index d9bdf9bba7b..399a0678685 100644
--- a/src/gallium/drivers/iris/iris_fence.c
+++ b/src/gallium/drivers/iris/iris_fence.c
@@ -154,7 +154,7 @@ clear_stale_syncobjs(struct iris_batch *batch)
 
       if (syncobj != nth_syncobj) {
          *syncobj = *nth_syncobj;
-         memcpy(nth_fence, fence, sizeof(*fence));
+         memcpy(fence, nth_fence, sizeof(*fence));
       }
    }
 }