fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-11 04:50:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nouveau: create fence object when allocating pushbuf, instead of submit

Browse source
This commit is contained in:
Ben Skeggs 2008-03-17 14:22:36 +11:00
parent 767cd2ed6e
commit f93386de0f
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/winsys/dri/nouveau/nouveau_bo.c
View file

@ -376,9 +376,10 @@ nouveau_bo_validate_bo(struct nouveau_channel *chan, struct nouveau_bo *bo,
int
nouveau_bo_validate(struct nouveau_channel *chan, struct nouveau_bo *bo,
struct nouveau_fence *fence, uint32_t flags)
uint32_t flags)
{
struct nouveau_bo_priv *nvbo = nouveau_bo(bo);
struct nouveau_fence *fence = nouveau_pushbuf(chan->pushbuf)->fence;
int ret;
assert(bo->map == NULL);

4
src/gallium/winsys/dri/nouveau/nouveau_drmif.h
View file

@ -127,6 +127,8 @@ struct nouveau_pushbuf_bo {
struct nouveau_pushbuf_priv {
struct nouveau_pushbuf base;
struct nouveau_fence *fence;
unsigned nop_jump;
unsigned start;
unsigned size;
@ -288,7 +290,7 @@ nouveau_bo_unmap(struct nouveau_bo *);
extern int
nouveau_bo_validate(struct nouveau_channel *, struct nouveau_bo *,
struct nouveau_fence *fence, uint32_t flags);
uint32_t flags);
extern int
nouveau_resource_init(struct nouveau_resource **heap, unsigned start,

14
src/gallium/winsys/dri/nouveau/nouveau_pushbuf.c
View file

@ -56,6 +56,10 @@ nouveau_pushbuf_space(struct nouveau_channel *chan, unsigned min)
nvpb->base.remaining = nvpb->size;
nvpb->base.cur = &nvchan->pushbuf[nvpb->start];
/* Create a new fence object for this "frame" */
nouveau_fence_ref(NULL, &nvpb->fence);
nouveau_fence_new(chan, &nvpb->fence);
return 0;
}
@ -128,7 +132,6 @@ nouveau_pushbuf_flush(struct nouveau_channel *chan, unsigned min)
struct nouveau_channel_priv *nvchan = nouveau_channel(chan);
struct nouveau_pushbuf_priv *nvpb = &nvchan->pb;
struct nouveau_pushbuf_bo *pbbo;
struct nouveau_fence *fence = NULL;
int ret;
if (nvpb->base.remaining == nvpb->size)
@ -139,10 +142,6 @@ nouveau_pushbuf_flush(struct nouveau_channel *chan, unsigned min)
nvchan->dma->free -= nvpb->size;
assert(nvchan->dma->cur <= nvchan->dma->max);
ret = nouveau_fence_new(chan, &fence);
if (ret)
return ret;
nvchan->dma = &nvchan->dma_bufmgr;
nvchan->pushbuf[nvpb->nop_jump] = 0x20000000 |
(nvchan->dma->base + (nvchan->dma->cur << 2));
@ -153,7 +152,7 @@ nouveau_pushbuf_flush(struct nouveau_channel *chan, unsigned min)
struct nouveau_pushbuf_reloc *r;
struct nouveau_bo *bo = &ptr_to_bo(pbbo->handle)->base;
ret = nouveau_bo_validate(chan, bo, fence, pbbo->flags);
ret = nouveau_bo_validate(chan, bo, pbbo->flags);
assert (ret == 0);
if (bo->offset == nouveau_bo(bo)->offset &&
@ -188,9 +187,8 @@ nouveau_pushbuf_flush(struct nouveau_channel *chan, unsigned min)
nvchan->dma = &nvchan->dma_master;
/* Fence + kickoff */
nouveau_fence_emit(fence);
nouveau_fence_emit(nvpb->fence);
FIRE_RING_CH(chan);
nouveau_fence_ref(NULL, &fence);
/* Allocate space for next push buffer */
ret = nouveau_pushbuf_space(chan, min);