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

nouveau: remove automatic buffer migration heuristics

Browse source
This commit is contained in:
Christoph Bumiller 2012-02-10 13:18:13 +01:00 • committed by Ben Skeggs
parent 66c7dc5688
commit a3fee8fc86
4 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/nouveau/nouveau_buffer.c
View file

@ -200,9 +200,6 @@ nouveau_buffer_transfer_destroy(struct pipe_context *pipe,
struct nouveau_context *nv = nouveau_context(pipe);
if (xfr->base.usage & PIPE_TRANSFER_WRITE) {
/* writing is worse */
nouveau_buffer_adjust_score(nv, buf, -5000);
if (buf->domain == NOUVEAU_BO_VRAM) {
nouveau_buffer_upload(nv, buf, transfer->box.x, transfer->box.width);
}
@ -257,8 +254,6 @@ nouveau_buffer_transfer_map(struct pipe_context *pipe,
uint32_t offset = xfr->base.box.x;
uint32_t flags;
nouveau_buffer_adjust_score(nouveau_context(pipe), buf, -250);
if (buf->domain != NOUVEAU_BO_GART)
return buf->data + offset;

25
src/gallium/drivers/nouveau/nouveau_buffer.h
View file

@ -8,10 +8,6 @@ struct pipe_resource;
struct nouveau_context;
struct nouveau_bo;
#define NOUVEAU_BUFFER_SCORE_MIN -25000
#define NOUVEAU_BUFFER_SCORE_MAX 25000
#define NOUVEAU_BUFFER_SCORE_VRAM_THRESHOLD 20000
/* DIRTY: buffer was (or will be after the next flush) written to by GPU and
* resource->data has not been updated to reflect modified VRAM contents
*
@ -39,8 +35,6 @@ struct nv04_resource {
uint8_t status;
uint8_t domain;
int16_t score; /* low if mapped very often, if high can move to VRAM */
struct nouveau_fence *fence;
struct nouveau_fence *fence_wr;
@ -58,23 +52,6 @@ boolean
nouveau_buffer_migrate(struct nouveau_context *,
struct nv04_resource *, unsigned domain);
static INLINE void
nouveau_buffer_adjust_score(struct nouveau_context *pipe,
struct nv04_resource *res, int16_t score)
{
if (score < 0) {
if (res->score > NOUVEAU_BUFFER_SCORE_MIN)
res->score += score;
} else
if (score > 0){
if (res->score < NOUVEAU_BUFFER_SCORE_MAX)
res->score += score;
if (res->domain == NOUVEAU_BO_GART &&
res->score > NOUVEAU_BUFFER_SCORE_VRAM_THRESHOLD)
nouveau_buffer_migrate(pipe, res, NOUVEAU_BO_VRAM);
}
}
/* XXX: wait for fence (atm only using this for vertex push) */
static INLINE void *
nouveau_resource_map_offset(struct nouveau_context *pipe,
@ -83,8 +60,6 @@ nouveau_resource_map_offset(struct nouveau_context *pipe,
{
void *map;
nouveau_buffer_adjust_score(pipe, res, -250);
if ((res->domain == NOUVEAU_BO_VRAM) &&
(res->status & NOUVEAU_BUFFER_STATUS_GPU_WRITING))
nouveau_buffer_download(pipe, res, 0, res->base.width0);

3
src/gallium/drivers/nv50/nv50_vbo.c
View file

@ -219,7 +219,6 @@ nv50_prevalidate_vbufs(struct nv50_context *nv50)
}
}
nv50_bufctx_add_resident(nv50, NV50_BUFCTX_VERTEX, buf, NOUVEAU_BO_RD);
nouveau_buffer_adjust_score(&nv50->base, buf, 1);
}
}
@ -541,8 +540,6 @@ nv50_draw_elements(struct nv50_context *nv50, boolean shorten,
start += nv50->idxbuf.offset >> (index_size >> 1);
nouveau_buffer_adjust_score(&nv50->base, res, 1);
while (instance_count--) {
BEGIN_RING(chan, RING_3D(VERTEX_BEGIN_GL), 1);
OUT_RING (chan, mode);

3
src/gallium/drivers/nvc0/nvc0_vbo.c
View file

@ -197,7 +197,6 @@ nvc0_prevalidate_vbufs(struct nvc0_context *nvc0)
}
}
nvc0_bufctx_add_resident(nvc0, NVC0_BUFCTX_VERTEX, buf, NOUVEAU_BO_RD);
nouveau_buffer_adjust_score(&nvc0->base, buf, 1);
}
}
@ -516,8 +515,6 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
unsigned offset = nvc0->idxbuf.offset;
unsigned limit = nvc0->idxbuf.buffer->width0 - 1;
nouveau_buffer_adjust_score(&nvc0->base, res, 1);
while (instance_count--) {
MARK_RING (chan, 11, 4);
BEGIN_RING(chan, RING_3D(VERTEX_BEGIN_GL), 1);