mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-06-09 12:18:18 +02:00
nvc0: implement queries
This commit is contained in:
Christoph Bumiller
parent
e59fa4c46c
commit
b3d8e1fb3b
10 changed files with 432 additions and 23 deletions
|
|
@ -28,6 +28,7 @@ C_SOURCES = \
|
|||
nvc0_push.c \
|
||||
nvc0_push2.c \
|
||||
nvc0_fence.c \
|
||||
nvc0_mm.c
|
||||
nvc0_mm.c \
|
||||
nvc0_query.c
|
||||
|
||||
include ../../Makefile.template
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@ nvc0 = env.ConvenienceLibrary(
|
|||
'nvc0_push.c',
|
||||
'nvc0_push2.c',
|
||||
'nvc0_fence.c',
|
||||
'nvc0_mm.c'
|
||||
'nvc0_mm.c',
|
||||
'nvc0_query.c'
|
||||
])
|
||||
|
||||
Export('nvc0')
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
|
|||
git clone git://0x04.net/rules-ng-ng
|
||||
|
||||
The rules-ng-ng source files this header was generated from are:
|
||||
- nvc0_3d.xml ( 28058 bytes, from 2010-11-26 18:05:20)
|
||||
- nvc0_3d.xml ( 30401 bytes, from 2011-01-08 18:09:11)
|
||||
- copyright.xml ( 6452 bytes, from 2010-11-25 23:28:20)
|
||||
- nv_defs.xml ( 4437 bytes, from 2010-07-06 07:43:58)
|
||||
- nv_3ddefs.xml ( 16394 bytes, from 2010-10-09 08:27:14)
|
||||
- nv_object.xml ( 11547 bytes, from 2010-11-26 16:41:56)
|
||||
- nv_3ddefs.xml ( 16394 bytes, from 2010-12-17 15:10:40)
|
||||
- nv_object.xml ( 11898 bytes, from 2010-12-23 14:14:20)
|
||||
- nvchipsets.xml ( 3074 bytes, from 2010-11-07 00:36:28)
|
||||
- nv50_defs.xml ( 4482 bytes, from 2010-10-03 13:18:37)
|
||||
- nv50_defs.xml ( 4487 bytes, from 2010-12-10 00:37:17)
|
||||
|
||||
Copyright (C) 2006-2010 by the following authors:
|
||||
Copyright (C) 2006-2011 by the following authors:
|
||||
- Artur Huillet <arthur.huillet@free.fr> (ahuillet)
|
||||
- Ben Skeggs (darktama, darktama_)
|
||||
- B. R. <koala_br@users.sourceforge.net> (koala_br)
|
||||
|
|
@ -248,6 +248,24 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#define NVC0_3D_CLIPID_REGION_VERT_H__MASK 0xffff0000
|
||||
#define NVC0_3D_CLIPID_REGION_VERT_H__SHIFT 16
|
||||
|
||||
#define NVC0_3D_COUNTER_ENABLE 0x00000d68
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK00 0x00000001
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK01 0x00000002
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK02 0x00000004
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK03 0x00000008
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK04 0x00000010
|
||||
#define NVC0_3D_COUNTER_ENABLE_EMITTED_PRIMITIVES 0x00000020
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK06 0x00000040
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK07 0x00000080
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK08 0x00000100
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK09 0x00000200
|
||||
#define NVC0_3D_COUNTER_ENABLE_GENERATED_PRIMITIVES 0x00000400
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK0B 0x00000800
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK0C 0x00001000
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK0D 0x00002000
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK0E 0x00004000
|
||||
#define NVC0_3D_COUNTER_ENABLE_UNK0F 0x00008000
|
||||
|
||||
#define NVC0_3D_VERTEX_BUFFER_FIRST 0x00000d74
|
||||
|
||||
#define NVC0_3D_VERTEX_BUFFER_COUNT 0x00000d78
|
||||
|
|
@ -498,14 +516,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#define NVC0_3D_BLEND_COLOR__LEN 0x00000004
|
||||
|
||||
#define NVC0_3D_TSC_FLUSH 0x00001330
|
||||
#define NVC0_3D_TSC_FLUSH_UNK0 0x00000001
|
||||
#define NVC0_3D_TSC_FLUSH_UNK1__MASK 0x03fffff0
|
||||
#define NVC0_3D_TSC_FLUSH_UNK1__SHIFT 4
|
||||
#define NVC0_3D_TSC_FLUSH_SPECIFIC 0x00000001
|
||||
#define NVC0_3D_TSC_FLUSH_ENTRY__MASK 0x03fffff0
|
||||
#define NVC0_3D_TSC_FLUSH_ENTRY__SHIFT 4
|
||||
|
||||
#define NVC0_3D_TIC_FLUSH 0x00001334
|
||||
#define NVC0_3D_TIC_FLUSH_UNK0 0x00000001
|
||||
#define NVC0_3D_TIC_FLUSH_UNK1__MASK 0x03fffff0
|
||||
#define NVC0_3D_TIC_FLUSH_UNK1__SHIFT 4
|
||||
#define NVC0_3D_TIC_FLUSH_SPECIFIC 0x00000001
|
||||
#define NVC0_3D_TIC_FLUSH_ENTRY__MASK 0x03fffff0
|
||||
#define NVC0_3D_TIC_FLUSH_ENTRY__SHIFT 4
|
||||
|
||||
#define NVC0_3D_TEX_CACHE_CTL 0x00001338
|
||||
#define NVC0_3D_TEX_CACHE_CTL_UNK1__MASK 0x00000030
|
||||
|
|
@ -630,7 +648,25 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#define NVC0_3D_POINT_SPRITE_ENABLE 0x00001520
|
||||
|
||||
#define NVC0_3D_SAMPLECNT_RESET 0x00001530
|
||||
#define NVC0_3D_COUNTER_RESET 0x00001530
|
||||
#define NVC0_3D_COUNTER_RESET_SAMPLECNT 0x00000001
|
||||
#define NVC0_3D_COUNTER_RESET_UNK02 0x00000002
|
||||
#define NVC0_3D_COUNTER_RESET_UNK03 0x00000003
|
||||
#define NVC0_3D_COUNTER_RESET_UNK04 0x00000004
|
||||
#define NVC0_3D_COUNTER_RESET_EMITTED_PRIMITIVES 0x00000010
|
||||
#define NVC0_3D_COUNTER_RESET_UNK11 0x00000011
|
||||
#define NVC0_3D_COUNTER_RESET_UNK12 0x00000012
|
||||
#define NVC0_3D_COUNTER_RESET_UNK13 0x00000013
|
||||
#define NVC0_3D_COUNTER_RESET_UNK15 0x00000015
|
||||
#define NVC0_3D_COUNTER_RESET_UNK16 0x00000016
|
||||
#define NVC0_3D_COUNTER_RESET_UNK17 0x00000017
|
||||
#define NVC0_3D_COUNTER_RESET_UNK18 0x00000018
|
||||
#define NVC0_3D_COUNTER_RESET_UNK1A 0x0000001a
|
||||
#define NVC0_3D_COUNTER_RESET_UNK1B 0x0000001b
|
||||
#define NVC0_3D_COUNTER_RESET_UNK1C 0x0000001c
|
||||
#define NVC0_3D_COUNTER_RESET_UNK1D 0x0000001d
|
||||
#define NVC0_3D_COUNTER_RESET_UNK1E 0x0000001e
|
||||
#define NVC0_3D_COUNTER_RESET_GENERATED_PRIMITIVES 0x0000001f
|
||||
|
||||
#define NVC0_3D_MULTISAMPLE_ZETA_ENABLE 0x00001534
|
||||
|
||||
|
|
@ -960,11 +996,30 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#define NVC0_3D_QUERY_SEQUENCE 0x00001b08
|
||||
|
||||
#define NVC0_3D_QUERY_GET 0x00001b0c
|
||||
#define NVC0_3D_QUERY_GET_FENCE 0x1000f010
|
||||
#define NVC0_3D_QUERY_GET_SAMPLE_COUNT 0x0100f002
|
||||
#define NVC0_3D_QUERY_GET_TFB 0x05805002
|
||||
#define NVC0_3D_QUERY_GET_GENERATED_PRIMS 0x06805002
|
||||
#define NVC0_3D_QUERY_GET_UNK00005002 0x00005002
|
||||
#define NVC0_3D_QUERY_GET_MODE__MASK 0x00000003
|
||||
#define NVC0_3D_QUERY_GET_MODE__SHIFT 0
|
||||
#define NVC0_3D_QUERY_GET_MODE_WRITE_UNK0 0x00000000
|
||||
#define NVC0_3D_QUERY_GET_MODE_SYNC 0x00000001
|
||||
#define NVC0_3D_QUERY_GET_MODE_WRITE_UNK2 0x00000002
|
||||
#define NVC0_3D_QUERY_GET_FENCE 0x00000010
|
||||
#define NVC0_3D_QUERY_GET_STREAM__MASK 0x000000e0
|
||||
#define NVC0_3D_QUERY_GET_STREAM__SHIFT 5
|
||||
#define NVC0_3D_QUERY_GET_UNK8 0x00000100
|
||||
#define NVC0_3D_QUERY_GET_UNIT__MASK 0x0000f000
|
||||
#define NVC0_3D_QUERY_GET_UNIT__SHIFT 12
|
||||
#define NVC0_3D_QUERY_GET_SYNC_COND__MASK 0x00010000
|
||||
#define NVC0_3D_QUERY_GET_SYNC_COND__SHIFT 16
|
||||
#define NVC0_3D_QUERY_GET_SYNC_COND_NEQUAL 0x00000000
|
||||
#define NVC0_3D_QUERY_GET_SYNC_COND_GREATER 0x00010000
|
||||
#define NVC0_3D_QUERY_GET_INTR 0x00100000
|
||||
#define NVC0_3D_QUERY_GET_UNK21 0x00200000
|
||||
#define NVC0_3D_QUERY_GET_SELECT__MASK 0x0f800000
|
||||
#define NVC0_3D_QUERY_GET_SELECT__SHIFT 23
|
||||
#define NVC0_3D_QUERY_GET_SELECT_ZERO 0x00000000
|
||||
#define NVC0_3D_QUERY_GET_SELECT_SAMPLECNT 0x01000000
|
||||
#define NVC0_3D_QUERY_GET_SELECT_EMITTED_PRIMS 0x05800000
|
||||
#define NVC0_3D_QUERY_GET_SELECT_GENERATED_PRIMS 0x09000000
|
||||
#define NVC0_3D_QUERY_GET_SHORT 0x10000000
|
||||
|
||||
#define NVC0_3D_VERTEX_ARRAY_FETCH(i0) (0x00001c00 + 0x10*(i0))
|
||||
#define NVC0_3D_VERTEX_ARRAY_FETCH__ESIZE 0x00000010
|
||||
|
|
@ -1026,6 +1081,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#define NVC0_3D_TEX_LIMITS__ESIZE 0x00000010
|
||||
#define NVC0_3D_TEX_LIMITS__LEN 0x00000005
|
||||
|
||||
#define NVC0_3D_FIRMWARE(i0) (0x00002300 + 0x4*(i0))
|
||||
#define NVC0_3D_FIRMWARE__ESIZE 0x00000004
|
||||
#define NVC0_3D_FIRMWARE__LEN 0x00000020
|
||||
|
||||
#define NVC0_3D_CB_SIZE 0x00002380
|
||||
|
||||
#define NVC0_3D_CB_ADDRESS_HIGH 0x00002384
|
||||
|
|
|
|||
|
|
@ -52,8 +52,7 @@ static INLINE void
|
|||
release_allocation(struct nvc0_mm_allocation **mm, struct nvc0_fence *fence)
|
||||
{
|
||||
if (fence && fence->state != NVC0_FENCE_STATE_SIGNALLED) {
|
||||
(*mm)->next = fence->buffers;
|
||||
fence->buffers = (*mm);
|
||||
nvc0_fence_sched_release(fence, *mm);
|
||||
} else {
|
||||
nvc0_mm_free(*mm);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ nvc0_create(struct pipe_screen *pscreen, void *priv)
|
|||
|
||||
screen->base.channel->user_private = nvc0;
|
||||
|
||||
nvc0_init_query_functions(nvc0);
|
||||
nvc0_init_surface_functions(nvc0);
|
||||
nvc0_init_state_functions(nvc0);
|
||||
nvc0_init_resource_functions(&nvc0->pipe);
|
||||
|
|
|
|||
|
|
@ -166,6 +166,9 @@ extern struct draw_stage *nvc0_draw_render_stage(struct nvc0_context *);
|
|||
boolean nvc0_program_translate(struct nvc0_program *);
|
||||
void nvc0_program_destroy(struct nvc0_context *, struct nvc0_program *);
|
||||
|
||||
/* nvc0_query.c */
|
||||
void nvc0_init_query_functions(struct nvc0_context *);
|
||||
|
||||
/* nvc0_shader_state.c */
|
||||
void nvc0_vertprog_validate(struct nvc0_context *);
|
||||
void nvc0_tctlprog_validate(struct nvc0_context *);
|
||||
|
|
|
|||
|
|
@ -59,7 +59,8 @@ nvc0_fence_emit(struct nvc0_fence *fence)
|
|||
OUT_RELOCh(chan, screen->fence.bo, 0, NOUVEAU_BO_WR);
|
||||
OUT_RELOCl(chan, screen->fence.bo, 0, NOUVEAU_BO_WR);
|
||||
OUT_RING (chan, fence->sequence);
|
||||
OUT_RING (chan, NVC0_3D_QUERY_GET_FENCE);
|
||||
OUT_RING (chan, NVC0_3D_QUERY_GET_FENCE | NVC0_3D_QUERY_GET_SHORT |
|
||||
(0xf << NVC0_3D_QUERY_GET_UNIT__SHIFT));
|
||||
|
||||
++fence->ref;
|
||||
|
||||
|
|
|
|||
337
src/gallium/drivers/nvc0/nvc0_query.c
Normal file
337
src/gallium/drivers/nvc0/nvc0_query.c
Normal file
|
|
@ -0,0 +1,337 @@
|
|||
/*
|
||||
* Copyright 2011 Nouveau Project
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
|
||||
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
* Authors: Christoph Bumiller
|
||||
*/
|
||||
|
||||
#include "nvc0_context.h"
|
||||
#include "nouveau/nv_object.xml.h"
|
||||
|
||||
/* XXX: Nested queries, and simultaneous queries on multiple gallium contexts
|
||||
* (since we use only a single GPU channel per screen) will not work properly.
|
||||
*
|
||||
* The first is not that big of an issue because OpenGL does not allow nested
|
||||
* queries anyway.
|
||||
*/
|
||||
|
||||
struct nvc0_query {
|
||||
uint32_t *data;
|
||||
uint32_t type;
|
||||
uint32_t sequence;
|
||||
struct nouveau_bo *bo;
|
||||
uint32_t base;
|
||||
uint32_t offset; /* base + i * 16 */
|
||||
boolean ready;
|
||||
boolean is64bit;
|
||||
struct nvc0_mm_allocation *mm;
|
||||
};
|
||||
|
||||
#define NVC0_QUERY_ALLOC_SPACE 128
|
||||
|
||||
static INLINE struct nvc0_query *
|
||||
nvc0_query(struct pipe_query *pipe)
|
||||
{
|
||||
return (struct nvc0_query *)pipe;
|
||||
}
|
||||
|
||||
static boolean
|
||||
nvc0_query_allocate(struct nvc0_context *nvc0, struct nvc0_query *q, int size)
|
||||
{
|
||||
struct nvc0_screen *screen = nvc0->screen;
|
||||
int ret;
|
||||
|
||||
if (q->bo) {
|
||||
nouveau_bo_ref(NULL, &q->bo);
|
||||
if (q->mm) {
|
||||
if (q->ready)
|
||||
nvc0_mm_free(q->mm);
|
||||
else
|
||||
nvc0_fence_sched_release(screen->fence.current, q->mm);
|
||||
}
|
||||
}
|
||||
if (size) {
|
||||
q->mm = nvc0_mm_allocate(screen->mm_GART, size, &q->bo, &q->base);
|
||||
if (!q->bo)
|
||||
return FALSE;
|
||||
q->offset = q->base;
|
||||
|
||||
ret = nouveau_bo_map_range(q->bo, q->base, size, NOUVEAU_BO_RD |
|
||||
NOUVEAU_BO_NOSYNC);
|
||||
if (ret) {
|
||||
nvc0_query_allocate(nvc0, q, 0);
|
||||
return FALSE;
|
||||
}
|
||||
q->data = q->bo->map;
|
||||
nouveau_bo_unmap(q->bo);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
nvc0_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
|
||||
{
|
||||
nvc0_query_allocate(nvc0_context(pipe), nvc0_query(pq), 0);
|
||||
FREE(nvc0_query(pq));
|
||||
}
|
||||
|
||||
static struct pipe_query *
|
||||
nvc0_query_create(struct pipe_context *pipe, unsigned type)
|
||||
{
|
||||
struct nvc0_context *nvc0 = nvc0_context(pipe);
|
||||
struct nvc0_query *q;
|
||||
|
||||
q = CALLOC_STRUCT(nvc0_query);
|
||||
if (!q)
|
||||
return NULL;
|
||||
|
||||
if (!nvc0_query_allocate(nvc0, q, NVC0_QUERY_ALLOC_SPACE)) {
|
||||
FREE(q);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
q->is64bit = (type == PIPE_QUERY_PRIMITIVES_GENERATED ||
|
||||
type == PIPE_QUERY_PRIMITIVES_EMITTED ||
|
||||
type == PIPE_QUERY_SO_STATISTICS);
|
||||
q->type = type;
|
||||
|
||||
if (q->type == PIPE_QUERY_OCCLUSION_COUNTER) {
|
||||
q->offset -= 16;
|
||||
q->data -= 16 / sizeof(*q->data); /* we advance before query_begin ! */
|
||||
}
|
||||
|
||||
return (struct pipe_query *)q;
|
||||
}
|
||||
|
||||
static void
|
||||
nvc0_query_get(struct nouveau_channel *chan, struct nvc0_query *q,
|
||||
unsigned offset, uint32_t get)
|
||||
{
|
||||
offset += q->offset;
|
||||
|
||||
MARK_RING (chan, 5, 2);
|
||||
BEGIN_RING(chan, RING_3D(QUERY_ADDRESS_HIGH), 4);
|
||||
OUT_RELOCh(chan, q->bo, offset, NOUVEAU_BO_GART | NOUVEAU_BO_WR);
|
||||
OUT_RELOCl(chan, q->bo, offset, NOUVEAU_BO_GART | NOUVEAU_BO_WR);
|
||||
OUT_RING (chan, q->sequence);
|
||||
OUT_RING (chan, get);
|
||||
}
|
||||
|
||||
static void
|
||||
nvc0_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
|
||||
{
|
||||
struct nvc0_context *nvc0 = nvc0_context(pipe);
|
||||
struct nouveau_channel *chan = nvc0->screen->base.channel;
|
||||
struct nvc0_query *q = nvc0_query(pq);
|
||||
|
||||
/* For occlusion queries we have to change the storage, because a previous
|
||||
* query might set the initial render conition to FALSE even *after* we re-
|
||||
* initialized it to TRUE.
|
||||
*/
|
||||
if (q->type == PIPE_QUERY_OCCLUSION_COUNTER) {
|
||||
q->offset += 16;
|
||||
q->data += 16 / sizeof(*q->data);
|
||||
if (q->offset - q->base == NVC0_QUERY_ALLOC_SPACE)
|
||||
nvc0_query_allocate(nvc0, q, NVC0_QUERY_ALLOC_SPACE);
|
||||
|
||||
/* XXX: can we do this with the GPU, and sync with respect to a previous
|
||||
* query ?
|
||||
*/
|
||||
q->data[1] = 1; /* initial render condition = TRUE */
|
||||
}
|
||||
if (!q->is64bit)
|
||||
q->data[0] = q->sequence++; /* the previously used one */
|
||||
|
||||
switch (q->type) {
|
||||
case PIPE_QUERY_OCCLUSION_COUNTER:
|
||||
IMMED_RING(chan, RING_3D(COUNTER_RESET), NVC0_3D_COUNTER_RESET_SAMPLECNT);
|
||||
IMMED_RING(chan, RING_3D(SAMPLECNT_ENABLE), 1);
|
||||
break;
|
||||
case PIPE_QUERY_PRIMITIVES_GENERATED: /* store before & after instead ? */
|
||||
IMMED_RING(chan, RING_3D(COUNTER_RESET),
|
||||
NVC0_3D_COUNTER_RESET_GENERATED_PRIMITIVES);
|
||||
break;
|
||||
case PIPE_QUERY_PRIMITIVES_EMITTED:
|
||||
IMMED_RING(chan, RING_3D(COUNTER_RESET),
|
||||
NVC0_3D_COUNTER_RESET_EMITTED_PRIMITIVES);
|
||||
break;
|
||||
case PIPE_QUERY_SO_STATISTICS:
|
||||
BEGIN_RING_NI(chan, RING_3D(COUNTER_RESET), 2);
|
||||
OUT_RING (chan, NVC0_3D_COUNTER_RESET_EMITTED_PRIMITIVES);
|
||||
OUT_RING (chan, NVC0_3D_COUNTER_RESET_GENERATED_PRIMITIVES);
|
||||
break;
|
||||
case PIPE_QUERY_TIMESTAMP_DISJOINT:
|
||||
case PIPE_QUERY_TIME_ELAPSED:
|
||||
nvc0_query_get(chan, q, 0x10, 0x00005002);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
q->ready = FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
nvc0_query_end(struct pipe_context *pipe, struct pipe_query *pq)
|
||||
{
|
||||
struct nvc0_context *nvc0 = nvc0_context(pipe);
|
||||
struct nouveau_channel *chan = nvc0->screen->base.channel;
|
||||
struct nvc0_query *q = nvc0_query(pq);
|
||||
|
||||
const int index = 0; /* for multiple vertex streams */
|
||||
|
||||
switch (q->type) {
|
||||
case PIPE_QUERY_OCCLUSION_COUNTER:
|
||||
nvc0_query_get(chan, q, 0, 0x0100f002);
|
||||
BEGIN_RING(chan, RING_3D(SAMPLECNT_ENABLE), 1);
|
||||
OUT_RING (chan, 0);
|
||||
break;
|
||||
case PIPE_QUERY_PRIMITIVES_GENERATED:
|
||||
nvc0_query_get(chan, q, 0, 0x09005002 | (index << 5));
|
||||
break;
|
||||
case PIPE_QUERY_PRIMITIVES_EMITTED:
|
||||
nvc0_query_get(chan, q, 0, 0x05805002 | (index << 5));
|
||||
break;
|
||||
case PIPE_QUERY_SO_STATISTICS:
|
||||
nvc0_query_get(chan, q, 0x00, 0x05805002 | (index << 5));
|
||||
nvc0_query_get(chan, q, 0x10, 0x09005002 | (index << 5));
|
||||
break;
|
||||
case PIPE_QUERY_TIMESTAMP_DISJOINT:
|
||||
case PIPE_QUERY_TIME_ELAPSED:
|
||||
nvc0_query_get(chan, q, 0, 0x00005002);
|
||||
break;
|
||||
case PIPE_QUERY_GPU_FINISHED:
|
||||
nvc0_query_get(chan, q, 0, 0x1000f010);
|
||||
break;
|
||||
default:
|
||||
assert(0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static INLINE boolean
|
||||
nvc0_query_ready(struct nvc0_query *q)
|
||||
{
|
||||
return q->ready || (!q->is64bit && (q->data[0] == q->sequence));
|
||||
}
|
||||
|
||||
static INLINE boolean
|
||||
nvc0_query_wait(struct nvc0_query *q)
|
||||
{
|
||||
int ret = nouveau_bo_map(q->bo, NOUVEAU_BO_RD);
|
||||
if (ret)
|
||||
return FALSE;
|
||||
nouveau_bo_unmap(q->bo);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static boolean
|
||||
nvc0_query_result(struct pipe_context *pipe, struct pipe_query *pq,
|
||||
boolean wait, void *result)
|
||||
{
|
||||
struct nvc0_query *q = nvc0_query(pq);
|
||||
uint64_t *res64 = result;
|
||||
uint32_t *res32 = result;
|
||||
boolean *res8 = result;
|
||||
uint64_t *data64 = (uint64_t *)q->data;
|
||||
|
||||
if (q->type == PIPE_QUERY_GPU_FINISHED) {
|
||||
res8[0] = nvc0_query_ready(q);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if (!q->ready) /* update ? */
|
||||
q->ready = nvc0_query_ready(q);
|
||||
if (!q->ready) {
|
||||
struct nouveau_channel *chan = nvc0_context(pipe)->screen->base.channel;
|
||||
if (!wait) {
|
||||
if (nouveau_bo_pending(q->bo) & NOUVEAU_BO_WR) /* for daft apps */
|
||||
FIRE_RING(chan);
|
||||
return FALSE;
|
||||
}
|
||||
if (!nvc0_query_wait(q))
|
||||
return FALSE;
|
||||
}
|
||||
q->ready = TRUE;
|
||||
|
||||
switch (q->type) {
|
||||
case PIPE_QUERY_OCCLUSION_COUNTER: /* u32 sequence, u32 count, u64 time */
|
||||
res32[0] = q->data[1];
|
||||
break;
|
||||
case PIPE_QUERY_PRIMITIVES_GENERATED: /* u64 count, u64 time */
|
||||
case PIPE_QUERY_PRIMITIVES_EMITTED: /* u64 count, u64 time */
|
||||
res64[0] = data64[0];
|
||||
break;
|
||||
case PIPE_QUERY_SO_STATISTICS:
|
||||
res64[0] = data64[0];
|
||||
res64[1] = data64[1];
|
||||
break;
|
||||
case PIPE_QUERY_TIMESTAMP_DISJOINT: /* u32 sequence, u32 0, u64 time */
|
||||
res64[0] = 1000000000;
|
||||
res8[8] = (data64[0] == data64[2]) ? FALSE : TRUE;
|
||||
break;
|
||||
case PIPE_QUERY_TIME_ELAPSED:
|
||||
res64[0] = data64[1] - data64[3];
|
||||
break;
|
||||
default:
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
nvc0_render_condition(struct pipe_context *pipe,
|
||||
struct pipe_query *pq, uint mode)
|
||||
{
|
||||
struct nvc0_context *nvc0 = nvc0_context(pipe);
|
||||
struct nouveau_channel *chan = nvc0->screen->base.channel;
|
||||
struct nvc0_query *q;
|
||||
|
||||
if (!pq) {
|
||||
IMMED_RING(chan, RING_3D(COND_MODE), NVC0_3D_COND_MODE_ALWAYS);
|
||||
return;
|
||||
}
|
||||
q = nvc0_query(pq);
|
||||
|
||||
if (mode == PIPE_RENDER_COND_WAIT ||
|
||||
mode == PIPE_RENDER_COND_BY_REGION_WAIT) {
|
||||
BEGIN_RING(chan, RING_3D_(NV84_SUBCHAN_QUERY_ADDRESS_HIGH), 4);
|
||||
OUT_RELOCh(chan, q->bo, q->offset, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
|
||||
OUT_RELOCl(chan, q->bo, q->offset, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
|
||||
OUT_RING (chan, q->sequence);
|
||||
OUT_RING (chan, 0x00001001);
|
||||
}
|
||||
|
||||
BEGIN_RING(chan, RING_3D(COND_ADDRESS_HIGH), 3);
|
||||
OUT_RELOCh(chan, q->bo, q->offset, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
|
||||
OUT_RELOCl(chan, q->bo, q->offset, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
|
||||
OUT_RING (chan, NVC0_3D_COND_MODE_RES_NON_ZERO);
|
||||
}
|
||||
|
||||
void
|
||||
nvc0_init_query_functions(struct nvc0_context *nvc0)
|
||||
{
|
||||
nvc0->pipe.create_query = nvc0_query_create;
|
||||
nvc0->pipe.destroy_query = nvc0_query_destroy;
|
||||
nvc0->pipe.begin_query = nvc0_query_begin;
|
||||
nvc0->pipe.end_query = nvc0_query_end;
|
||||
nvc0->pipe.get_query_result = nvc0_query_result;
|
||||
nvc0->pipe.render_condition = nvc0_render_condition;
|
||||
}
|
||||
|
|
@ -92,9 +92,9 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
|
|||
return 1;
|
||||
case PIPE_CAP_MAX_RENDER_TARGETS:
|
||||
return 8;
|
||||
case PIPE_CAP_TIMER_QUERY:
|
||||
case PIPE_CAP_OCCLUSION_QUERY:
|
||||
return 1;
|
||||
case PIPE_CAP_TIMER_QUERY:
|
||||
case PIPE_CAP_STREAM_OUTPUT:
|
||||
return 0;
|
||||
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||
|
|
|
|||
|
|
@ -86,6 +86,13 @@ struct nvc0_mm_allocation {
|
|||
uint32_t offset;
|
||||
};
|
||||
|
||||
static INLINE void
|
||||
nvc0_fence_sched_release(struct nvc0_fence *nf, struct nvc0_mm_allocation *mm)
|
||||
{
|
||||
mm->next = nf->buffers;
|
||||
nf->buffers = mm;
|
||||
}
|
||||
|
||||
extern struct nvc0_mman *
|
||||
nvc0_mm_create(struct nouveau_device *, uint32_t domain, uint32_t storage_type);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue