<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div> </div><div>Marek </div></div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jun 19, 2019 at 4:42 AM Thomas Hellström (VMware) <<a href="mailto:thomas@shipmail.org">thomas@shipmail.org</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Thomas Hellstrom <<a href="mailto:thellstrom@vmware.com" target="_blank">thellstrom@vmware.com</a>> For svga, the use of persistent / coherent maps is typically slightly slower than without them. It's probably a bit case-dependent and possible to tune, but for now, make sure we can disable those. Signed-off-by: Thomas Hellstrom <<a href="mailto:thellstrom@vmware.com" target="_blank">thellstrom@vmware.com</a>> Reviewed-by: Brian Paul <<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a>> --- src/gallium/auxiliary/util/u_upload_mgr.c | 14 ++++++++++++-- src/gallium/auxiliary/util/u_upload_mgr.h | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c b/src/gallium/auxiliary/util/u_upload_mgr.c index c2c0ba957e3..73f6cae0b6d 100644 --- a/src/gallium/auxiliary/util/u_upload_mgr.c +++ b/src/gallium/auxiliary/util/u_upload_mgr.c @@ -106,8 +106,10 @@ u_upload_clone(struct pipe_context *pipe, struct u_upload_mgr *upload) struct u_upload_mgr *result = u_upload_create(pipe, upload->default_size, upload->bind, upload->usage, upload->flags); - if (upload->map_persistent && - upload->map_flags & PIPE_TRANSFER_FLUSH_EXPLICIT) + if (!upload->map_persistent && result->map_persistent) + u_upload_disable_persistent(result); + else if (upload->map_persistent && + upload->map_flags & PIPE_TRANSFER_FLUSH_EXPLICIT) u_upload_enable_flush_explicit(result); return result; @@ -121,6 +123,14 @@ u_upload_enable_flush_explicit(struct u_upload_mgr *upload) upload->map_flags |= PIPE_TRANSFER_FLUSH_EXPLICIT; } +void +u_upload_disable_persistent(struct u_upload_mgr *upload) +{ + upload->map_persistent = FALSE; + upload->map_flags &= ~(PIPE_TRANSFER_COHERENT | PIPE_TRANSFER_PERSISTENT); + upload->map_flags |= PIPE_TRANSFER_FLUSH_EXPLICIT; +} + static void upload_unmap_internal(struct u_upload_mgr *upload, boolean destroying) { diff --git a/src/gallium/auxiliary/util/u_upload_mgr.h b/src/gallium/auxiliary/util/u_upload_mgr.h index 80832016272..6a4a60963fe 100644 --- a/src/gallium/auxiliary/util/u_upload_mgr.h +++ b/src/gallium/auxiliary/util/u_upload_mgr.h @@ -73,6 +73,10 @@ u_upload_clone(struct pipe_context *pipe, struct u_upload_mgr *upload); void u_upload_enable_flush_explicit(struct u_upload_mgr *upload); +/** Whether to avoid persistent mappings where available */ +void +u_upload_disable_persistent(struct u_upload_mgr *upload); + /** * Destroy the upload manager. */ -- 2.20.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a></blockquote></div>