KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

venus: prepare for splitting vn_device.[ch] 

Make virtqueue/ring sync functions available to other files.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Ryan Neph <ryanneph@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10117>
This commit is contained in:
Chia-I Wu 2021-04-07 15:26:15 -07:00 committed by Marge Bot
parent 41535aa80b
commit 5a3f632373
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/virtio/vulkan/vn_device.c
View File

@ -239,7 +239,7 @@ vn_instance_submit_roundtrip(struct vn_instance *instance,
return result;
}
static void
void
vn_instance_wait_roundtrip(struct vn_instance *instance,
uint32_t roundtrip_seqno)
{
@ -254,14 +254,6 @@ vn_instance_wait_roundtrip(struct vn_instance *instance,
} while (true);
}
static void
vn_instance_roundtrip(struct vn_instance *instance)
{
uint32_t roundtrip_seqno;
if (vn_instance_submit_roundtrip(instance, &roundtrip_seqno) == VK_SUCCESS)
vn_instance_wait_roundtrip(instance, roundtrip_seqno);
}
struct vn_instance_submission {
uint32_t local_cs_data[64];
@ -471,11 +463,15 @@ vn_instance_ring_submit_locked(struct vn_instance *instance,
return VK_SUCCESS;
}
static void
vn_instance_ring_wait(struct vn_instance *instance)
VkResult
vn_instance_ring_submit(struct vn_instance *instance,
const struct vn_cs_encoder *cs)
{
struct vn_ring *ring = &instance->ring.ring;
vn_ring_wait_all(ring);
mtx_lock(&instance->ring.mutex);
VkResult result = vn_instance_ring_submit_locked(instance, cs, NULL, NULL);
mtx_unlock(&instance->ring.mutex);
return result;
}
static bool
@ -7083,10 +7079,7 @@ vn_EndCommandBuffer(VkCommandBuffer commandBuffer)
}
vn_instance_wait_roundtrip(instance, cmd->cs.current_buffer_roundtrip);
mtx_lock(&instance->ring.mutex);
VkResult result =
vn_instance_ring_submit_locked(instance, &cmd->cs, NULL, NULL);
mtx_unlock(&instance->ring.mutex);
VkResult result = vn_instance_ring_submit(instance, &cmd->cs);
if (result != VK_SUCCESS) {
cmd->state = VN_COMMAND_BUFFER_STATE_INVALID;
return vn_error(instance, result);

23
src/virtio/vulkan/vn_device.h
View File

@ -424,6 +424,29 @@ VkResult
vn_instance_submit_roundtrip(struct vn_instance *instance,
uint32_t *roundtrip_seqno);
void
vn_instance_wait_roundtrip(struct vn_instance *instance,
uint32_t roundtrip_seqno);
static inline void
vn_instance_roundtrip(struct vn_instance *instance)
{
uint32_t roundtrip_seqno;
if (vn_instance_submit_roundtrip(instance, &roundtrip_seqno) == VK_SUCCESS)
vn_instance_wait_roundtrip(instance, roundtrip_seqno);
}
VkResult
vn_instance_ring_submit(struct vn_instance *instance,
const struct vn_cs_encoder *cs);
static inline void
vn_instance_ring_wait(struct vn_instance *instance)
{
struct vn_ring *ring = &instance->ring.ring;
vn_ring_wait_all(ring);
}
struct vn_instance_submit_command {
/* empty command implies errors */
struct vn_cs_encoder command;