From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sat, 29 Sep 2018 08:39:39 +0000 (+0200)
Subject: iris: 36-bit overflow fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07ff8c752f667f6fa6d579d56ef15422f52e82a1;p=mesa.git

iris: 36-bit overflow fixes
---

diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c
index 15937a8be8d..6148835e05c 100644
--- a/src/gallium/drivers/iris/iris_query.c
+++ b/src/gallium/drivers/iris/iris_query.c
@@ -267,7 +267,7 @@ calculate_result_on_cpu(const struct gen_device_info *devinfo,
    case PIPE_QUERY_TIMESTAMP_DISJOINT:
       /* The timestamp is the single starting snapshot. */
       q->result = iris_timebase_scale(devinfo, q->map->start);
-      // XXX: 36-bit overflow?
+      q->result &= (1ull << 36) - 1;
       break;
    case PIPE_QUERY_TIME_ELAPSED:
       q->result = iris_raw_timestamp_delta(q->map->start, q->map->end);