search for: query_heap

...erying the result in-between. For now we'll wait for * the existing query to notify completion, but it could be better. */ - if (q->object) { - uint64_t tmp; + if (q->object) pipe->get_query_result(pipe, pq, 1, &tmp); + + while (nouveau_resource_alloc(nv30->screen->query_heap, 1, NULL, &q->object)) + { + struct nv30_query* oldestq; + assert(!LIST_IS_EMPTY(&nv30->screen->query_list)); + oldestq = LIST_ENTRY(struct nv30_query, nv30->screen->query_list.next, list); + pipe->get_query_result(pipe, (struct pipe_query*)oldestq, 1, &tmp); }...

...erying the result in-between. For now we'll wait for * the existing query to notify completion, but it could be better. */ - if (q->object) { - uint64_t tmp; + if (q->object) pipe->get_query_result(pipe, pq, 1, &tmp); + + while (nouveau_resource_alloc(nv30->screen->query_heap, 1, NULL, &q->object)) + { + struct nv30_query* oldestq; + assert(!LIST_IS_EMPTY(&nv30->screen->query_list)); + oldestq = LIST_ENTRY(struct nv30_query, nv30->screen->query_list.next, list); + pipe->get_query_result(pipe, (struct pipe_query*)oldestq, 1, &tmp); }...

...<maarten.lankhorst at canonical.com> wrote: > op 21-06-14 14:12, Ilia Mirkin schreef: >> On Tue, Jun 17, 2014 at 2:34 AM, Maarten Lankhorst >> <maarten.lankhorst at canonical.com> wrote: >>> nv30 seems to not support dma objects with offset, so simply extend the query_heap to cover the >>> entire notifier, and use a offset in nv30_context_kick_notify. >> It would be great if you could detail the list of transformations that >> were done in the commit description, as well as what the "new way" is >> (if any) for the various concept...

...i; + for (i = 0; i < NV40_STATE_MAX; i++) { + if (screen->state[i]) + so_ref(NULL, &screen->state[i]); + } + nouveau_resource_free(&screen->vp_exec_heap); nouveau_resource_free(&screen->vp_data_heap); nouveau_resource_free(&screen->query_heap); Index: nv40_context.c =================================================================== --- nv40_context.c (wersja 32083) +++ nv40_context.c (kopia robocza) @@ -25,7 +25,13 @@ nv40_destroy(struct pipe_context *pipe) { struct nv40_context *nv40 = nv40_context(pipe); + unsigned i; +...

...i; + for (i = 0; i < NV40_STATE_MAX; i++) { + if (screen->state[i]) + so_ref(NULL, &screen->state[i]); + } + nouveau_resource_free(&screen->vp_exec_heap); nouveau_resource_free(&screen->vp_data_heap); nouveau_resource_free(&screen->query_heap); Index: nv40/nv40_fragprog.c =================================================================== --- nv40/nv40_fragprog.c (wersja 32083) +++ nv40/nv40_fragprog.c (kopia robocza) @@ -948,6 +948,12 @@ nv40_fragprog_destroy(struct nv40_context *nv40, struct nv40_fragment_program *fp) {...

...creen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -327,6 +327,12 @@ nv30_screen_destroy(struct pipe_screen *pscreen) nouveau_fence_ref(NULL, &screen->base.fence.current); } + nouveau_bo_ref(NULL, &screen->notify); + + nouveau_heap_destroy(&screen->query_heap); + nouveau_heap_destroy(&screen->vp_exec_heap); + nouveau_heap_destroy(&screen->vp_data_heap); + nouveau_object_del(&screen->query); nouveau_object_del(&screen->fence); nouveau_object_del(&screen->ntfy); diff --git a/src/gallium/drivers/nouveau/nv...

op 21-06-14 14:12, Ilia Mirkin schreef: > On Tue, Jun 17, 2014 at 2:34 AM, Maarten Lankhorst > <maarten.lankhorst at canonical.com> wrote: >> nv30 seems to not support dma objects with offset, so simply extend the query_heap to cover the >> entire notifier, and use a offset in nv30_context_kick_notify. > It would be great if you could detail the list of transformations that > were done in the commit description, as well as what the "new way" is > (if any) for the various concepts. I moved the p...

...khorst at canonical.com> wrote: >> op 21-06-14 14:12, Ilia Mirkin schreef: >>> On Tue, Jun 17, 2014 at 2:34 AM, Maarten Lankhorst >>> <maarten.lankhorst at canonical.com> wrote: >>>> nv30 seems to not support dma objects with offset, so simply extend the query_heap to cover the >>>> entire notifier, and use a offset in nv30_context_kick_notify. >>> It would be great if you could detail the list of transformations that >>> were done in the commit description, as well as what the "new way" is >>> (if any) for the...

On Tue, Jun 17, 2014 at 2:34 AM, Maarten Lankhorst <maarten.lankhorst at canonical.com> wrote: > nv30 seems to not support dma objects with offset, so simply extend the query_heap to cover the > entire notifier, and use a offset in nv30_context_kick_notify. It would be great if you could detail the list of transformations that were done in the commit description, as well as what the "new way" is (if any) for the various concepts. This change doesn't have a...

nv30 seems to not support dma objects with offset, so simply extend the query_heap to cover the entire notifier, and use a offset in nv30_context_kick_notify. Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- src/gallium/drivers/nouveau/nouveau_buffer.c | 14 +- src/gallium/drivers/nouveau/nouveau_context.h | 5 + src/gallium/drivers/...

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- src/gallium/drivers/nouveau/nouveau_fence.c | 76 ++++++++++++------------- src/gallium/drivers/nouveau/nouveau_fence.h | 22 +++++-- src/gallium/drivers/nouveau/nouveau_screen.c | 9 +++ src/gallium/drivers/nouveau/nouveau_screen.h | 14 ++--- src/gallium/drivers/nouveau/nv30/nv30_context.c | 4 +-

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com> --- src/gallium/drivers/nouveau/nouveau_fence.c | 76 ++++++++++++------------- src/gallium/drivers/nouveau/nouveau_fence.h | 22 +++++-- src/gallium/drivers/nouveau/nouveau_screen.c | 9 +++ src/gallium/drivers/nouveau/nouveau_screen.h | 14 ++--- src/gallium/drivers/nouveau/nv30/nv30_context.c | 4