summaryrefslogtreecommitdiff
path: root/src/sna/gen2_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-12-08 22:39:32 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-12-08 22:42:11 +0000
commit4e4e10935d2815fb62aeaedbfffe10aad115ec0b (patch)
tree67cb878a98a00986224fed1d0d634ea3463319e2 /src/sna/gen2_render.c
parentcef11795f627a393d4254845b0a19eefbf6c782c (diff)
sna: Flush upon change of target if GPU is idle
The aim is to improve GPU concurrency by keeping it busy. The possible complication is that we incur more overhead due to small batches. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen2_render.c')
-rw-r--r--src/sna/gen2_render.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index b37af9b9..2123cb9e 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -536,9 +536,9 @@ static void gen2_emit_invariant(struct sna *sna)
}
static void
-gen2_get_batch(struct sna *sna)
+gen2_get_batch(struct sna *sna, const struct sna_composite_op *op)
{
- kgem_set_mode(&sna->kgem, KGEM_RENDER);
+ kgem_set_mode(&sna->kgem, KGEM_RENDER, op->dst.bo);
if (!kgem_check_batch(&sna->kgem, INVARIANT_SIZE+40)) {
DBG(("%s: flushing batch: size %d > %d\n",
@@ -662,7 +662,7 @@ static void gen2_emit_composite_state(struct sna *sna,
uint32_t cblend, ablend;
int tex;
- gen2_get_batch(sna);
+ gen2_get_batch(sna, op);
if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
if (op->src.bo == op->dst.bo || op->mask.bo == op->dst.bo)
@@ -2146,7 +2146,7 @@ static void gen2_emit_composite_spans_state(struct sna *sna,
{
uint32_t unwind;
- gen2_get_batch(sna);
+ gen2_get_batch(sna, &op->base);
gen2_emit_target(sna, &op->base);
unwind = sna->kgem.nbatch;
@@ -2404,7 +2404,7 @@ static void gen2_emit_fill_composite_state(struct sna *sna,
{
uint32_t ls1;
- gen2_get_batch(sna);
+ gen2_get_batch(sna, op);
gen2_emit_target(sna, op);
ls1 = sna->kgem.nbatch;
@@ -2589,7 +2589,7 @@ static void gen2_emit_fill_state(struct sna *sna,
{
uint32_t ls1;
- gen2_get_batch(sna);
+ gen2_get_batch(sna, op);
gen2_emit_target(sna, op);
ls1 = sna->kgem.nbatch;
@@ -2882,7 +2882,7 @@ static void gen2_emit_copy_state(struct sna *sna, const struct sna_composite_op
{
uint32_t ls1, v;
- gen2_get_batch(sna);
+ gen2_get_batch(sna, op);
if (kgem_bo_is_dirty(op->src.bo)) {
if (op->src.bo == op->dst.bo)