From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 3 May 2018 05:01:10 +0000 (-0700)
Subject: iris: fix decoding and undo testing code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=48ddd7212d0667f223fc6336478abe5a8080d660;p=mesa.git

iris: fix decoding and undo testing code
---

diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index e3e38b2c27d..a1fbd3e3183 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -321,6 +321,9 @@ iris_batch_emit(struct iris_batch *batch, const void *data, unsigned size)
 static void
 iris_finish_batch(struct iris_batch *batch)
 {
+   if (batch->bo == batch->exec_bos[0])
+      batch->primary_batch_size = batch_bytes_used(batch);
+
    // XXX: ISP DIS
 
    /* Emit MI_BATCH_BUFFER_END to finish our batch.  Note that execbuf2
@@ -357,8 +360,7 @@ submit_batch(struct iris_batch *batch, int in_fence_fd, int *out_fence_fd)
       .buffers_ptr = (uintptr_t) batch->validation_list,
       .buffer_count = batch->exec_count,
       .batch_start_offset = 0,
-      .batch_len = batch->bo == batch->exec_bos[0] ? batch_bytes_used(batch)
-                                                   : batch->primary_batch_size,
+      .batch_len = batch->primary_batch_size,
       .flags = batch->ring |
                I915_EXEC_NO_RELOC |
                I915_EXEC_BATCH_FIRST |