From 4c71c8a74ad29bd84ca16803672ad1e9e30e2fff Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 5 May 2016 01:57:30 -0700 Subject: [PATCH] i965: Only enable ARB_query_buffer_object for newer kernels on Haswell. On Haswell, we need version 6 of the kernel command parser in order to write the math registers. Our implementation of ARB_query_buffer_object heavily relies on MI_MATH, so we should only advertise it when MI_MATH is available. We also need MI_LOAD_REGISTER_REG, which requires version 7 of the command parser. To make these checks easier, introduce a screen->has_mi_math_and_lrr flag that will be set when both commands are supported. Signed-off-by: Kenneth Graunke Reviewed-by: Jordan Justen --- src/mesa/drivers/dri/i965/intel_extensions.c | 2 +- src/mesa/drivers/dri/i965/intel_screen.c | 8 ++++++++ src/mesa/drivers/dri/i965/intel_screen.h | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index 588df1abf9d..8d98788a838 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -366,7 +366,7 @@ intelInitExtensions(struct gl_context *ctx) } } - if (brw->gen >= 8 || brw->is_haswell) { + if (brw->intelScreen->has_mi_math_and_lrr) { ctx->Extensions.ARB_query_buffer_object = true; } diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index db9d94d3b34..f9b54842eb9 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1531,6 +1531,14 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) if (ret == -1) intelScreen->cmd_parser_version = 0; + /* Haswell requires command parser version 6 in order to write to the + * MI_MATH GPR registers, and version 7 in order to use + * MI_LOAD_REGISTER_REG (which all users of MI_MATH use). + */ + intelScreen->has_mi_math_and_lrr = intelScreen->devinfo->gen >= 8 || + (intelScreen->devinfo->is_haswell && + intelScreen->cmd_parser_version >= 7); + psp->extensions = !intelScreen->has_context_reset_notification ? intelScreenExtensions : intelRobustScreenExtensions; diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h index 01d45d0c016..98f9d24901c 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.h +++ b/src/mesa/drivers/dri/i965/intel_screen.h @@ -55,6 +55,12 @@ struct intel_screen */ bool has_resource_streamer; + /** + * Does the current hardware and kernel support MI_MATH and + * MI_LOAD_REGISTER_REG? + */ + bool has_mi_math_and_lrr; + /** * Does the kernel support context reset notifications? */ -- 2.30.2