Import Mesa 20.0.8

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/mesa/src/gallium/drivers/iris/iris_monitor.c b/lib/mesa/src/gallium/drivers/iris/iris_monitor.c
index 730fae271..f2c0774b1 100644
--- a/lib/mesa/src/gallium/drivers/iris/iris_monitor.c
+++ b/lib/mesa/src/gallium/drivers/iris/iris_monitor.c
@@ -72,17 +72,16 @@ iris_get_monitor_info(struct pipe_screen *pscreen, unsigned index,
    case GEN_PERF_COUNTER_DATA_TYPE_BOOL32:
    case GEN_PERF_COUNTER_DATA_TYPE_UINT32:
       info->type = PIPE_DRIVER_QUERY_TYPE_UINT;
-      assert(counter->raw_max <= UINT32_MAX);
-      info->max_value.u32 = (uint32_t)counter->raw_max;
+      info->max_value.u32 = 0;
       break;
    case GEN_PERF_COUNTER_DATA_TYPE_UINT64:
       info->type = PIPE_DRIVER_QUERY_TYPE_UINT64;
-      info->max_value.u64 = counter->raw_max;
+      info->max_value.u64 = 0;
       break;
    case GEN_PERF_COUNTER_DATA_TYPE_FLOAT:
    case GEN_PERF_COUNTER_DATA_TYPE_DOUBLE:
       info->type = PIPE_DRIVER_QUERY_TYPE_FLOAT;
-      info->max_value.f = counter->raw_max;
+      info->max_value.u64 = -1;
       break;
    default:
       assert(false);
@@ -355,7 +354,7 @@ iris_get_monitor_result(struct pipe_context *ctx,
    assert(gen_perf_is_query_ready(perf_ctx, monitor->query, batch));
 
    unsigned bytes_written;
-   gen_perf_get_query_data(perf_ctx, monitor->query, batch,
+   gen_perf_get_query_data(perf_ctx, monitor->query,
                            monitor->result_size,
                            (unsigned*) monitor->result_buffer,
                            &bytes_written);