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

etnaviv: rework wait/flush logic

Browse source 
Saves us from doing an extra flush in !wait case and seems more
logical now. Also evaluate etna_bo_cpu_prep(..) retun value.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1530>
This commit is contained in:
Christian Gmeiner 2019-07-31 12:38:53 +02:00 • committed by Marge Bot
parent d1697fef1a
commit f47b4eddd9
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/etnaviv/etnaviv_query_acc.c
View file

@ -167,10 +167,8 @@ etna_acc_get_query_result(struct etna_context *ctx, struct etna_query *q,
assert(list_is_empty(&aq->node));
if (!wait) {
int ret;
if (rsc->status & ETNA_PENDING_WRITE) {
if (rsc->status & ETNA_PENDING_WRITE) {
if (!wait) {
/* piglit spec@arb_occlusion_query@occlusion_query_conform
* test, and silly apps perhaps, get stuck in a loop trying
* to get query result forever with wait==false.. we don't
@ -183,20 +181,16 @@ etna_acc_get_query_result(struct etna_context *ctx, struct etna_query *q,
}
return false;
} else {
/* flush that GPU executes all query related actions */
ctx->base.flush(&ctx->base, NULL, 0);
}
ret = etna_bo_cpu_prep(rsc->bo, DRM_ETNA_PREP_READ | DRM_ETNA_PREP_NOSYNC);
if (ret)
return false;
etna_bo_cpu_fini(rsc->bo);
}
/* flush that GPU executes all query related actions */
ctx->base.flush(&ctx->base, NULL, 0);
/* get the result */
etna_bo_cpu_prep(rsc->bo, DRM_ETNA_PREP_READ);
int ret = etna_bo_cpu_prep(rsc->bo, DRM_ETNA_PREP_READ);
if (ret)
return false;
void *ptr = etna_bo_map(rsc->bo);
p->result(aq, ptr, result);