From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 3 Oct 2018 03:09:01 +0000 (-0700)
Subject: iris: don't mark contains_draw = false when chaining batches
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=822f91508e7459d8b367be266d5fb8c5ce3e6b65;p=mesa.git

iris: don't mark contains_draw = false when chaining batches

chaining to a new batch reuses create_batch(), but we don't need to do
the work of pinning BOs we inherit from a previous batch...when that is
actually part of the same execbuf invocation.

instead, just flag it when setting primary_batch_size = 0, in
iris_batch_reset
---

diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index b35466d69f1..afc01109615 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -233,7 +233,6 @@ create_batch(struct iris_batch *batch)
    batch->bo->kflags |= EXEC_OBJECT_CAPTURE;
    batch->map = iris_bo_map(NULL, batch->bo, MAP_READ | MAP_WRITE);
    batch->map_next = batch->map;
-   batch->contains_draw = false;
 
    add_exec_bo(batch, batch->bo);
 }
@@ -247,6 +246,7 @@ iris_batch_reset(struct iris_batch *batch)
    }
    batch->last_bo = batch->bo;
    batch->primary_batch_size = 0;
+   batch->contains_draw = false;
 
    create_batch(batch);
    assert(batch->bo->index == 0);