From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 21 Jun 2019 23:04:52 +0000 (-0500)
Subject: Revert "iris: Don't check VF address high bits when there is no buffer."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5da37a826b873bc1bc0623ddad1814dd646e3226;p=mesa.git

Revert "iris: Don't check VF address high bits when there is no buffer."

This reverts commit db8f57a5cb4ab8e1ad789793678797c04e95de21.

This is bonkers.  There will always be a BO.
---

diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index ede679e731a..209940e9bc7 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/src/gallium/drivers/iris/iris_blorp.c
@@ -212,7 +212,7 @@ blorp_vf_invalidate_for_vb_48b_transitions(struct blorp_batch *blorp_batch,
       struct iris_bo *bo = addrs[i].buffer;
       uint16_t high_bits = bo ? bo->gtt_offset >> 32u : 0;
 
-      if (bo && high_bits != ice->state.last_vbo_high_bits[i]) {
+      if (high_bits != ice->state.last_vbo_high_bits[i]) {
          need_invalidate = true;
          ice->state.last_vbo_high_bits[i] = high_bits;
       }