xf86-video-intel: 4 commits - src/sna/gen3_render.c src/sna/gen5_render.c src/sna/gen6_render.c src/sna/gen7_render.c src/sna/kgem.c
Chris Wilson
ickle at kemper.freedesktop.org
Sat Feb 25 06:25:44 PST 2012
src/sna/gen3_render.c | 87 ++++++++++++++++++++++-----------
src/sna/gen5_render.c | 56 +++++++++++++++------
src/sna/gen6_render.c | 56 ++++++++++++++-------
src/sna/gen7_render.c | 52 +++++++++++++-------
src/sna/kgem.c | 130 ++++++++++++++++++++++++++++++++++++--------------
5 files changed, 267 insertions(+), 114 deletions(-)
New commits:
commit a3c398a6731874ba47e0a46bbd42bf9378e12ab8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Feb 25 10:59:14 2012 +0000
sna: Retain unfinished partial buffers between batches
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 4051892..4c70ad9 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1131,6 +1131,56 @@ static void kgem_bo_unref(struct kgem *kgem, struct kgem_bo *bo)
__kgem_bo_destroy(kgem, bo);
}
+static void bubble_sort_partial(struct kgem *kgem, struct kgem_partial_bo *bo)
+{
+ int remain = bytes(&bo->base) - bo->used;
+
+ while (bo->base.list.prev != &kgem->partial) {
+ struct kgem_partial_bo *p;
+
+ p = list_entry(bo->base.list.prev,
+ struct kgem_partial_bo,
+ base.list);
+ if (remain <= bytes(&p->base) - p->used)
+ break;
+
+ assert(p->base.list.next == &bo->base.list);
+ bo->base.list.prev = p->base.list.prev;
+ p->base.list.prev->next = &bo->base.list;
+ p->base.list.prev = &bo->base.list;
+
+ p->base.list.next = bo->base.list.next;
+ bo->base.list.next->prev = &p->base.list;
+ bo->base.list.next = &p->base.list;
+
+ assert(p->base.list.next->prev == &p->base.list);
+ assert(bo->base.list.prev->next == &bo->base.list);
+ }
+}
+
+static void kgem_retire_partials(struct kgem *kgem)
+{
+ struct kgem_partial_bo *bo, *next;
+
+ list_for_each_entry_safe(bo, next, &kgem->partial, base.list) {
+ if (bo->used == 0 || !bo->mmapped)
+ continue;
+ if (bo->base.refcnt != 1 || bo->base.rq)
+ continue;
+
+ DBG(("%s: handle=%d, used %d/%d\n", __FUNCTION__,
+ bo->base.handle, bo->used, bytes(&bo->base)));
+
+ assert(bo->write & KGEM_BUFFER_WRITE_INPLACE);
+ assert(kgem->has_llc || !IS_CPU_MAP(bo->base.map));
+ bo->base.dirty = false;
+ bo->base.needs_flush = false;
+ bo->used = 0;
+
+ bubble_sort_partial(kgem, bo);
+ }
+}
+
bool kgem_retire(struct kgem *kgem)
{
struct kgem_bo *bo, *next;
@@ -1233,6 +1283,8 @@ bool kgem_retire(struct kgem *kgem)
free(rq);
}
+ kgem_retire_partials(kgem);
+
kgem->need_retire = !list_is_empty(&kgem->requests);
DBG(("%s -- need_retire=%d\n", __FUNCTION__, kgem->need_retire));
@@ -1311,33 +1363,6 @@ static void kgem_close_inactive(struct kgem *kgem)
kgem_close_list(kgem, &kgem->inactive[i]);
}
-static void bubble_sort_partial(struct kgem *kgem, struct kgem_partial_bo *bo)
-{
- int remain = bytes(&bo->base) - bo->used;
-
- while (bo->base.list.prev != &kgem->partial) {
- struct kgem_partial_bo *p;
-
- p = list_entry(bo->base.list.prev,
- struct kgem_partial_bo,
- base.list);
- if (remain <= bytes(&p->base) - p->used)
- break;
-
- assert(p->base.list.next == &bo->base.list);
- bo->base.list.prev = p->base.list.prev;
- p->base.list.prev->next = &bo->base.list;
- p->base.list.prev = &bo->base.list;
-
- p->base.list.next = bo->base.list.next;
- bo->base.list.next->prev = &p->base.list;
- bo->base.list.next = &p->base.list;
-
- assert(p->base.list.next->prev == &p->base.list);
- assert(bo->base.list.prev->next == &bo->base.list);
- }
-}
-
static void kgem_finish_partials(struct kgem *kgem)
{
struct kgem_partial_bo *bo, *next;
@@ -1348,10 +1373,18 @@ static void kgem_finish_partials(struct kgem *kgem)
goto decouple;
}
- assert(bo->base.domain != DOMAIN_GPU);
if (!bo->base.exec)
continue;
+ if (bo->mmapped) {
+ assert(bo->write & KGEM_BUFFER_WRITE_INPLACE);
+ if (kgem->has_llc || !IS_CPU_MAP(bo->base.map)) {
+ DBG(("%s: retaining partial upload buffer (%d/%d)\n",
+ __FUNCTION__, bo->used, bytes(&bo->base)));
+ continue;
+ }
+ }
+
if (!bo->used) {
/* Unless we replace the handle in the execbuffer,
* then this bo will become active. So decouple it
@@ -1363,6 +1396,8 @@ static void kgem_finish_partials(struct kgem *kgem)
assert(bo->base.rq == kgem->next_request);
if (bo->used && bo->need_io) {
+ assert(bo->base.domain != DOMAIN_GPU);
+
if (bo->base.refcnt == 1 &&
bo->used < bytes(&bo->base) / 2) {
struct kgem_bo *shrink;
@@ -1768,7 +1803,7 @@ static void kgem_expire_partial(struct kgem *kgem)
struct kgem_partial_bo *bo, *next;
list_for_each_entry_safe(bo, next, &kgem->partial, base.list) {
- if (bo->base.refcnt > 1 || bo->base.exec)
+ if (bo->base.refcnt > 1 || bo->base.rq)
continue;
DBG(("%s: discarding unused partial buffer: %d/%d, write? %d\n",
@@ -3214,11 +3249,19 @@ struct kgem_bo *kgem_create_buffer(struct kgem *kgem,
if (bo->base.refcnt == 1 && bo->base.exec) {
DBG(("%s: reusing write buffer for read of %d bytes? used=%d, total=%d\n",
__FUNCTION__, size, bo->used, bytes(&bo->base)));
+ gem_write(kgem->fd, bo->base.handle,
+ 0, bo->used, bo->mem);
+ bo->need_io = 0;
+ bo->write = 0;
offset = 0;
goto done;
} else if (bo->used + size <= bytes(&bo->base)) {
DBG(("%s: reusing unfinished write buffer for read of %d bytes? used=%d, total=%d\n",
__FUNCTION__, size, bo->used, bytes(&bo->base)));
+ gem_write(kgem->fd, bo->base.handle,
+ 0, bo->used, bo->mem);
+ bo->need_io = 0;
+ bo->write = 0;
offset = bo->used;
goto done;
}
commit 8d773b88f45594f45174dc6f1a264d968690ce84
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Feb 25 09:32:20 2012 +0000
sna/gen3+: Keep the vertex buffer resident between batches
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index b50d067..8f597cf 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -1612,20 +1612,33 @@ static int gen3_vertex_finish(struct sna *sna)
static void gen3_vertex_close(struct sna *sna)
{
- struct kgem_bo *bo;
- int delta = 0;
+ struct kgem_bo *bo, *free_bo = NULL;
+ unsigned int delta = 0;
+
+ assert(sna->render_state.gen3.vertex_offset == 0);
- if (!sna->render.vertex_used) {
+ DBG(("%s: used=%d, vbo active? %d\n",
+ __FUNCTION__, sna->render.vertex_used, sna->render.vbo != NULL));
+
+ if (sna->render.vertex_used == 0) {
assert(sna->render.vbo == NULL);
assert(sna->render.vertices == sna->render.vertex_data);
assert(sna->render.vertex_size == ARRAY_SIZE(sna->render.vertex_data));
return;
}
- DBG(("%s: used=%d\n", __FUNCTION__, sna->render.vertex_used));
-
bo = sna->render.vbo;
- if (bo == NULL) {
+ if (bo) {
+ if (IS_CPU_MAP(bo->map) ||
+ sna->render.vertex_size - sna->render.vertex_used < 64) {
+ DBG(("%s: discarding vbo (was CPU mapped)\n",
+ __FUNCTION__));
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ free_bo = bo;
+ }
+ } else {
if (sna->kgem.nbatch + sna->render.vertex_used <= sna->kgem.surface) {
DBG(("%s: copy to batch: %d @ %d\n", __FUNCTION__,
sna->render.vertex_used, sna->kgem.nbatch));
@@ -1636,36 +1649,37 @@ static void gen3_vertex_close(struct sna *sna)
bo = NULL;
sna->kgem.nbatch += sna->render.vertex_used;
} else {
- bo = kgem_create_linear(&sna->kgem,
- 4*sna->render.vertex_used);
- if (bo && !kgem_bo_write(&sna->kgem, bo,
- sna->render.vertex_data,
- 4*sna->render.vertex_used)) {
- kgem_bo_destroy(&sna->kgem, bo);
- goto reset;
- }
DBG(("%s: new vbo: %d\n", __FUNCTION__,
sna->render.vertex_used));
+ bo = kgem_create_linear(&sna->kgem,
+ 4*sna->render.vertex_used);
+ if (bo)
+ kgem_bo_write(&sna->kgem, bo,
+ sna->render.vertex_data,
+ 4*sna->render.vertex_used);
+ free_bo = bo;
}
}
DBG(("%s: reloc = %d\n", __FUNCTION__,
sna->render.vertex_reloc[0]));
- sna->kgem.batch[sna->render.vertex_reloc[0]] =
- kgem_add_reloc(&sna->kgem, sna->render.vertex_reloc[0],
- bo, I915_GEM_DOMAIN_VERTEX << 16, delta);
- if (bo)
- kgem_bo_destroy(&sna->kgem, bo);
+ if (sna->render.vertex_reloc[0]) {
+ sna->kgem.batch[sna->render.vertex_reloc[0]] =
+ kgem_add_reloc(&sna->kgem, sna->render.vertex_reloc[0],
+ bo, I915_GEM_DOMAIN_VERTEX << 16, delta);
+ sna->render.vertex_reloc[0] = 0;
+ }
-reset:
- sna->render.vertex_reloc[0] = 0;
- sna->render.vertex_used = 0;
- sna->render.vertex_index = 0;
+ if (sna->render.vbo == NULL) {
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ assert(sna->render.vertices == sna->render.vertex_data);
+ assert(sna->render.vertex_size == ARRAY_SIZE(sna->render.vertex_data));
+ }
- sna->render.vbo = NULL;
- sna->render.vertices = sna->render.vertex_data;
- sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ if (free_bo)
+ kgem_bo_destroy(&sna->kgem, free_bo);
}
static bool gen3_rectangle_begin(struct sna *sna,
@@ -1885,10 +1899,23 @@ gen3_render_reset(struct sna *sna)
state->last_floats_per_vertex = 0;
state->last_vertex_offset = 0;
state->vertex_offset = 0;
+}
- assert(sna->render.vertex_used == 0);
- assert(sna->render.vertex_index == 0);
- assert(sna->render.vertex_reloc[0] == 0);
+static void
+gen3_render_retire(struct kgem *kgem)
+{
+ struct sna *sna;
+
+ sna = container_of(kgem, struct sna, kgem);
+ if (!kgem->need_retire && kgem->nbatch == 0 && sna->render.vbo) {
+ DBG(("%s: discarding vbo\n", __FUNCTION__));
+ kgem_bo_destroy(kgem, sna->render.vbo);
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ }
}
static Bool gen3_composite_channel_set_format(struct sna_composite_channel *channel,
@@ -4466,5 +4493,7 @@ Bool gen3_render_init(struct sna *sna)
render->max_3d_size = MAX_3D_SIZE;
render->max_3d_pitch = MAX_3D_PITCH;
+
+ sna->kgem.retire = gen3_render_retire;
return TRUE;
}
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index a80ce0a..bcba0d8 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -410,11 +410,14 @@ static int gen5_vertex_finish(struct sna *sna)
static void gen5_vertex_close(struct sna *sna)
{
- struct kgem_bo *bo;
+ struct kgem_bo *bo, *free_bo = NULL;
unsigned int i, delta = 0;
assert(sna->render_state.gen5.vertex_offset == 0);
+ DBG(("%s: used=%d, vbo active? %d\n",
+ __FUNCTION__, sna->render.vertex_used, sna->render.vbo != NULL));
+
if (!sna->render.vertex_used) {
assert(sna->render.vbo == NULL);
assert(sna->render.vertices == sna->render.vertex_data);
@@ -422,10 +425,18 @@ static void gen5_vertex_close(struct sna *sna)
return;
}
- DBG(("%s: used=%d\n", __FUNCTION__, sna->render.vertex_used));
-
bo = sna->render.vbo;
- if (bo == NULL) {
+ if (bo) {
+ if (IS_CPU_MAP(bo->map) ||
+ sna->render.vertex_size - sna->render.vertex_used < 64) {
+ DBG(("%s: discarding vbo (was CPU mapped)\n",
+ __FUNCTION__));
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ free_bo = bo;
+ }
+ } else {
if (sna->kgem.nbatch + sna->render.vertex_used <= sna->kgem.surface) {
DBG(("%s: copy to batch: %d @ %d\n", __FUNCTION__,
sna->render.vertex_used, sna->kgem.nbatch));
@@ -441,10 +452,11 @@ static void gen5_vertex_close(struct sna *sna)
sna->render.vertex_data,
4*sna->render.vertex_used)) {
kgem_bo_destroy(&sna->kgem, bo);
- goto reset;
+ bo = NULL;
}
DBG(("%s: new vbo: %d\n", __FUNCTION__,
sna->render.vertex_used));
+ free_bo = bo;
}
}
@@ -469,17 +481,13 @@ static void gen5_vertex_close(struct sna *sna)
}
}
- if (bo)
- kgem_bo_destroy(&sna->kgem, bo);
-
-reset:
- sna->render.vertex_used = 0;
- sna->render.vertex_index = 0;
- sna->render_state.gen5.vb_id = 0;
+ if (sna->render.vbo == NULL) {
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ }
- sna->render.vbo = NULL;
- sna->render.vertices = sna->render.vertex_data;
- sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ if (free_bo)
+ kgem_bo_destroy(&sna->kgem, free_bo);
}
static uint32_t gen5_get_blend(int op,
@@ -3470,6 +3478,23 @@ gen5_render_context_switch(struct kgem *kgem,
}
}
+static void
+gen5_render_retire(struct kgem *kgem)
+{
+ struct sna *sna;
+
+ sna = container_of(kgem, struct sna, kgem);
+ if (!kgem->need_retire && kgem->nbatch == 0 && sna->render.vbo) {
+ DBG(("%s: discarding vbo\n", __FUNCTION__));
+ kgem_bo_destroy(kgem, sna->render.vbo);
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ }
+}
+
static void gen5_render_reset(struct sna *sna)
{
sna->render_state.gen5.needs_invariant = TRUE;
@@ -3730,6 +3755,7 @@ Bool gen5_render_init(struct sna *sna)
return FALSE;
sna->kgem.context_switch = gen5_render_context_switch;
+ sna->kgem.retire = gen5_render_retire;
sna->render.composite = gen5_render_composite;
#if !NO_COMPOSITE_SPANS
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index b69b3a2..439fb52 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -989,9 +989,14 @@ static int gen6_vertex_finish(struct sna *sna)
static void gen6_vertex_close(struct sna *sna)
{
- struct kgem_bo *bo;
+ struct kgem_bo *bo, *free_bo = NULL;
unsigned int i, delta = 0;
+ assert(sna->render_state.gen6.vertex_offset == 0);
+
+ DBG(("%s: used=%d, vbo active? %d\n",
+ __FUNCTION__, sna->render.vertex_used, sna->render.vbo != NULL));
+
if (!sna->render.vertex_used) {
assert(sna->render.vbo == NULL);
assert(sna->render.vertices == sna->render.vertex_data);
@@ -999,13 +1004,16 @@ static void gen6_vertex_close(struct sna *sna)
return;
}
- DBG(("%s: used=%d / %d\n", __FUNCTION__,
- sna->render.vertex_used, sna->render.vertex_size));
-
bo = sna->render.vbo;
- if (bo == NULL) {
- assert(sna->render.vertices == sna->render.vertex_data);
- assert(sna->render.vertex_used < ARRAY_SIZE(sna->render.vertex_data));
+ if (bo) {
+ if (sna->render.vertex_size - sna->render.vertex_used < 64) {
+ DBG(("%s: discarding vbo (full)\n", __FUNCTION__));
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ free_bo = bo;
+ }
+ } else {
if (sna->kgem.nbatch + sna->render.vertex_used <= sna->kgem.surface) {
DBG(("%s: copy to batch: %d @ %d\n", __FUNCTION__,
sna->render.vertex_used, sna->kgem.nbatch));
@@ -1021,10 +1029,11 @@ static void gen6_vertex_close(struct sna *sna)
sna->render.vertex_data,
4*sna->render.vertex_used)) {
kgem_bo_destroy(&sna->kgem, bo);
- goto reset;
+ bo = NULL;
}
DBG(("%s: new vbo: %d\n", __FUNCTION__,
sna->render.vertex_used));
+ free_bo = bo;
}
}
@@ -1049,17 +1058,15 @@ static void gen6_vertex_close(struct sna *sna)
}
}
- if (bo)
- kgem_bo_destroy(&sna->kgem, bo);
-
-reset:
- sna->render.vertex_used = 0;
- sna->render.vertex_index = 0;
- sna->render_state.gen6.vb_id = 0;
+ if (sna->render.vbo == NULL) {
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ assert(sna->render.vertices == sna->render.vertex_data);
+ assert(sna->render.vertex_size == ARRAY_SIZE(sna->render.vertex_data));
+ }
- sna->render.vbo = NULL;
- sna->render.vertices = sna->render.vertex_data;
- sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ if (free_bo)
+ kgem_bo_destroy(&sna->kgem, free_bo);
}
typedef struct gen6_surface_state_padded {
@@ -4095,8 +4102,21 @@ gen6_render_context_switch(struct kgem *kgem,
static void
gen6_render_retire(struct kgem *kgem)
{
+ struct sna *sna;
+
if (kgem->ring && (kgem->has_semaphores || !kgem->need_retire))
kgem->ring = kgem->mode;
+
+ sna = container_of(kgem, struct sna, kgem);
+ if (!kgem->need_retire && kgem->nbatch == 0 && sna->render.vbo) {
+ DBG(("%s: discarding vbo\n", __FUNCTION__));
+ kgem_bo_destroy(kgem, sna->render.vbo);
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ }
}
static void gen6_render_reset(struct sna *sna)
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 0d913f6..e3d9757 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1086,9 +1086,14 @@ static int gen7_vertex_finish(struct sna *sna)
static void gen7_vertex_close(struct sna *sna)
{
- struct kgem_bo *bo;
+ struct kgem_bo *bo, *free_bo = NULL;
unsigned int i, delta = 0;
+ assert(sna->render_state.gen7.vertex_offset == 0);
+
+ DBG(("%s: used=%d, vbo active? %d\n",
+ __FUNCTION__, sna->render.vertex_used, sna->render.vbo != NULL));
+
if (!sna->render.vertex_used) {
assert(sna->render.vbo == NULL);
assert(sna->render.vertices == sna->render.vertex_data);
@@ -1096,11 +1101,16 @@ static void gen7_vertex_close(struct sna *sna)
return;
}
- DBG(("%s: used=%d / %d\n", __FUNCTION__,
- sna->render.vertex_used, sna->render.vertex_size));
-
bo = sna->render.vbo;
- if (bo == NULL) {
+ if (bo) {
+ if (sna->render.vertex_size - sna->render.vertex_used < 64) {
+ DBG(("%s: discarding vbo (full)\n", __FUNCTION__));
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ free_bo = bo;
+ }
+ } else {
if (sna->kgem.nbatch + sna->render.vertex_used <= sna->kgem.surface) {
DBG(("%s: copy to batch: %d @ %d\n", __FUNCTION__,
sna->render.vertex_used, sna->kgem.nbatch));
@@ -1116,10 +1126,11 @@ static void gen7_vertex_close(struct sna *sna)
sna->render.vertex_data,
4*sna->render.vertex_used)) {
kgem_bo_destroy(&sna->kgem, bo);
- goto reset;
+ bo = NULL;
}
DBG(("%s: new vbo: %d\n", __FUNCTION__,
sna->render.vertex_used));
+ free_bo = bo;
}
}
@@ -1144,17 +1155,13 @@ static void gen7_vertex_close(struct sna *sna)
}
}
- if (bo)
- kgem_bo_destroy(&sna->kgem, bo);
-
-reset:
- sna->render.vertex_used = 0;
- sna->render.vertex_index = 0;
- sna->render_state.gen7.vb_id = 0;
+ if (sna->render.vbo == NULL) {
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ }
- sna->render.vbo = NULL;
- sna->render.vertices = sna->render.vertex_data;
- sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ if (free_bo)
+ kgem_bo_destroy(&sna->kgem, free_bo);
}
static void null_create(struct sna_static_stream *stream)
@@ -4080,8 +4087,21 @@ gen7_render_context_switch(struct kgem *kgem,
static void
gen7_render_retire(struct kgem *kgem)
{
+ struct sna *sna;
+
if (kgem->ring && (kgem->has_semaphores || !kgem->need_retire))
kgem->ring = kgem->mode;
+
+ sna = container_of(kgem, struct sna, kgem);
+ if (!kgem->need_retire && kgem->nbatch == 0 && sna->render.vbo) {
+ DBG(("%s: discarding vbo\n", __FUNCTION__));
+ kgem_bo_destroy(kgem, sna->render.vbo);
+ sna->render.vbo = NULL;
+ sna->render.vertices = sna->render.vertex_data;
+ sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
+ sna->render.vertex_used = 0;
+ sna->render.vertex_index = 0;
+ }
}
static void gen7_render_reset(struct sna *sna)
commit 8cb773e7c809e1de23cd64d3db862d1f8e7e955a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Feb 25 11:07:16 2012 +0000
sna: Ensure we trigger a retire for search_linear_cache
Bo used for batch buffers are handled differently and not tracked
through the active cache, so we failed to notice when we might be able
to run retire and recover a suitable buffer for reuse. So simply always
run retire when we might need to create a new linear buffer.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index d73fc30..4051892 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1922,22 +1922,32 @@ search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
bool use_active = (flags & CREATE_INACTIVE) == 0;
struct list *cache;
+ DBG(("%s: num_pages=%d, flags=%x, use_active? %d\n",
+ __FUNCTION__, num_pages, flags, use_active));
+
if (num_pages >= MAX_CACHE_SIZE / PAGE_SIZE)
return NULL;
if (!use_active && list_is_empty(inactive(kgem, num_pages))) {
- if (list_is_empty(active(kgem, num_pages, I915_TILING_NONE)))
- return NULL;
+ DBG(("%s: inactive and cache bucket empty\n",
+ __FUNCTION__));
- if (!kgem_retire(kgem))
+ if (!kgem->need_retire || !kgem_retire(kgem)) {
+ DBG(("%s: nothing retired\n", __FUNCTION__));
return NULL;
+ }
- if (list_is_empty(inactive(kgem, num_pages)))
+ if (list_is_empty(inactive(kgem, num_pages))) {
+ DBG(("%s: active cache bucket still empty after retire\n",
+ __FUNCTION__));
return NULL;
+ }
}
if (!use_active && flags & (CREATE_CPU_MAP | CREATE_GTT_MAP)) {
int for_cpu = !!(flags & CREATE_CPU_MAP);
+ DBG(("%s: searching for inactive %s map\n",
+ __FUNCTION__, for_cpu ? "cpu" : "gtt"));
cache = &kgem->vma[for_cpu].inactive[cache_bucket(num_pages)];
list_for_each_entry(bo, cache, vma) {
assert(IS_CPU_MAP(bo->map) == for_cpu);
@@ -2111,7 +2121,7 @@ struct kgem_bo *kgem_create_linear(struct kgem *kgem, int size)
if (handle == 0)
return NULL;
- DBG(("%s: new handle=%d\n", __FUNCTION__, handle));
+ DBG(("%s: new handle=%d, num_pages=%d\n", __FUNCTION__, handle, size));
bo = __kgem_bo_alloc(handle, size);
if (bo == NULL) {
gem_close(kgem->fd, handle);
commit b1b4db8942e69d47aabfad3751165dc2252fa448
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Feb 25 00:43:30 2012 +0000
sna: Skip a tiled bo when searching the cache for a linear mmap
If we change tiling on a bo, we are effectively discarding the cached
mmap so it is preferable to look for another.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 007dc04..d73fc30 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1982,7 +1982,9 @@ search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
if (num_pages > num_pages(bo))
continue;
- if (use_active && bo->tiling != I915_TILING_NONE)
+ if (use_active &&
+ kgem->gen <= 40 &&
+ bo->tiling != I915_TILING_NONE)
continue;
if (bo->purged && !kgem_bo_clear_purgeable(kgem, bo)) {
@@ -1991,7 +1993,10 @@ search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
}
if (I915_TILING_NONE != bo->tiling) {
- if (use_active)
+ if (flags & (CREATE_CPU_MAP | CREATE_GTT_MAP))
+ continue;
+
+ if (first)
continue;
if (gem_set_tiling(kgem->fd, bo->handle,
More information about the xorg-commit
mailing list