fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 10:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus: avoid excessive ring notifications

Browse source 
The ring notification can be blocked on renderer main thread if a vq cmd
is waiting for a ring cmd (via a different non-idle ring). This change
optimizes to only try waking up the ring on the idle timeout period.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28287>
This commit is contained in:
Yiwei Zhang 2024-03-16 19:22:36 -07:00 • committed by Marge Bot
parent c81b6e5d4c
commit 30d7b3bdec
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/virtio/vulkan/vn_ring.c
View file

@ -11,6 +11,8 @@
#include "vn_instance.h"
#include "vn_renderer.h"
#define VN_RING_IDLE_TIMEOUT_NS (5ull * 1000 * 1000)
static_assert(ATOMIC_INT_LOCK_FREE == 2 && sizeof(atomic_uint) == 4,
"vn_ring_shared requires lock-free 32-bit atomic_uint");
@ -54,6 +56,9 @@ struct vn_ring {
/* to synchronize renderer/ring */
mtx_t roundtrip_mutex;
uint64_t roundtrip_next;
int64_t last_notify;
int64_t next_notify;
};
struct vn_ring_submit {
@ -320,7 +325,7 @@ vn_ring_create(struct vn_instance *instance,
.pNext = &monitor_info,
.resourceId = ring->shmem->res_id,
.size = layout->shmem_size,
.idleTimeout = 5ull * 1000 * 1000,
.idleTimeout = VN_RING_IDLE_TIMEOUT_NS,
.headOffset = layout->head_offset,
.tailOffset = layout->tail_offset,
.statusOffset = layout->status_offset,
@ -432,8 +437,19 @@ vn_ring_submit_internal(struct vn_ring *ring,
*seqno = submit->seqno;
/* notify renderer to wake up ring if idle */
return status & VK_RING_STATUS_IDLE_BIT_MESA;
/* Notify renderer to wake up idle ring if at least VN_RING_IDLE_TIMEOUT_NS
* has passed since the last sent notification to avoid excessive wake up
* calls (non-trivial since submitted via virtio-gpu kernel).
*/
if (status & VK_RING_STATUS_IDLE_BIT_MESA) {
const int64_t now = os_time_get_nano();
if (os_time_timeout(ring->last_notify, ring->next_notify, now)) {
ring->last_notify = now;
ring->next_notify = now + VN_RING_IDLE_TIMEOUT_NS;
return true;
}
}
return false;
}
static const struct vn_cs_encoder *