Mesa (master): gallium/u_threaded: execute transfer_unmap with THREAD_SAFE directly
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri May 15 22:45:33 UTC 2020
Module: Mesa
Branch: master
Commit: fd6a5e112aa1fd09bc01f4cf3ca211ad73cc404e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd6a5e112aa1fd09bc01f4cf3ca211ad73cc404e
Author: Marek Olšák <marek.olsak at amd.com>
Date: Wed May 13 15:43:58 2020 -0400
gallium/u_threaded: execute transfer_unmap with THREAD_SAFE directly
This was the original intention, but it wasn't fully implemented.
Fixes: 7f22e0fd29369f478da1d36520049f001cd698d1
Closes: #2953
Tested by: John Galt <johngalt at fake.mail>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5030>
---
src/gallium/auxiliary/util/u_threaded_context.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c
index 9e835867ef3..72111f34c01 100644
--- a/src/gallium/auxiliary/util/u_threaded_context.c
+++ b/src/gallium/auxiliary/util/u_threaded_context.c
@@ -1599,6 +1599,21 @@ tc_transfer_unmap(struct pipe_context *_pipe, struct pipe_transfer *transfer)
struct threaded_transfer *ttrans = threaded_transfer(transfer);
struct threaded_resource *tres = threaded_resource(transfer->resource);
+ /* PIPE_TRANSFER_THREAD_SAFE is only valid with UNSYNCHRONIZED. It can be
+ * called from any thread and bypasses all multithreaded queues.
+ */
+ if (transfer->usage & PIPE_TRANSFER_THREAD_SAFE) {
+ assert(transfer->usage & PIPE_TRANSFER_UNSYNCHRONIZED);
+ assert(!(transfer->usage & (PIPE_TRANSFER_FLUSH_EXPLICIT |
+ PIPE_TRANSFER_DISCARD_RANGE)));
+
+ struct pipe_context *pipe = tc->pipe;
+ pipe->transfer_unmap(pipe, transfer);
+ util_range_add(&tres->b, tres->base_valid_buffer_range,
+ transfer->box.x, transfer->box.x + transfer->box.width);
+ return;
+ }
+
if (tres->b.target == PIPE_BUFFER) {
if (transfer->usage & PIPE_TRANSFER_WRITE &&
!(transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT))
More information about the mesa-commit
mailing list