fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

virgl: do not cache external resources

Browse source 
We should not reuse a resource for other purposes when it can still
be accessed by another process or device.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
This commit is contained in:
Chia-I Wu 2019-06-06 14:58:39 -07:00
parent 7d43999e63
commit 71465fe569
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
View file

@ -160,7 +160,8 @@ static void virgl_drm_resource_reference(struct virgl_drm_winsys *qdws,
struct virgl_hw_res *old = *dres;
if (pipe_reference(&(*dres)->reference, &sres->reference)) {
if (!can_cache_resource_with_bind(old->bind)) {
if (!can_cache_resource_with_bind(old->bind) ||
p_atomic_read(&old->external)) {
virgl_hw_res_destroy(qdws, old);
} else {
mtx_lock(&qdws->mutex);
@ -226,6 +227,7 @@ virgl_drm_winsys_resource_create(struct virgl_winsys *qws,
res->size = size;
res->stride = stride;
pipe_reference_init(&res->reference, 1);
p_atomic_set(&res->external, false);
p_atomic_set(&res->num_cs_references, 0);
return res;
}
@ -456,6 +458,7 @@ virgl_drm_winsys_resource_create_handle(struct virgl_winsys *qws,
res->size = info_arg.size;
res->stride = info_arg.stride;
pipe_reference_init(&res->reference, 1);
p_atomic_set(&res->external, true);
res->num_cs_references = 0;
if (res->flink_name)
@ -502,6 +505,9 @@ static boolean virgl_drm_winsys_resource_get_handle(struct virgl_winsys *qws,
util_hash_table_set(qdws->bo_handles, (void *)(uintptr_t)res->bo_handle, res);
mtx_unlock(&qdws->bo_handles_mutex);
}
p_atomic_set(&res->external, true);
whandle->stride = stride;
return TRUE;
}

3
src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
View file

@ -47,6 +47,9 @@ struct virgl_hw_res {
uint32_t bind;
int64_t start, end;
uint32_t flink_name;
/* true when the resource is imported or exported */
int external;
};
struct virgl_drm_winsys