On 08/23/2012 01:22 PM, Eric Anholt wrote:
> Needs updated libdrm.
> ---
> configure.ac | 2 +-
> docs/GL3.txt | 2 +-
> src/mesa/drivers/dri/i965/brw_context.c | 2 +
> src/mesa/drivers/dri/i965/brw_queryobj.c | 50
> +++++++++++++++++++++++++
> src/mesa/drivers/dri/intel/intel_extensions.c | 8 ++++
> src/mesa/drivers/dri/intel/intel_reg.h | 2 +
> 6 files changed, 64 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 2ecedaf..3e1ec8c 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -29,7 +29,7 @@ LT_INIT([disable-static])
> dnl Versions for external dependencies
> LIBDRM_REQUIRED=2.4.24
> LIBDRM_RADEON_REQUIRED=2.4.31
> -LIBDRM_INTEL_REQUIRED=2.4.37
> +LIBDRM_INTEL_REQUIRED=2.4.38
> LIBDRM_NVVIEUX_REQUIRED=2.4.33
> LIBDRM_NOUVEAU_REQUIRED=2.4.33
> DRI2PROTO_REQUIRED=2.6
> diff --git a/docs/GL3.txt b/docs/GL3.txt
> index 55b108c..8b8e003 100644
> --- a/docs/GL3.txt
> +++ b/docs/GL3.txt
> @@ -80,7 +80,7 @@ GL_ARB_sampler_objects DONE
> (i965, r300, r600)
> GL_ARB_shader_bit_encoding DONE
> GL_ARB_texture_rgb10_a2ui DONE (r600)
> GL_ARB_texture_swizzle DONE (same as EXT
> version) (i965, r300, r600, swrast)
> -GL_ARB_timer_query DONE
> +GL_ARB_timer_query DONE (i965)
> GL_ARB_instanced_arrays DONE (i965, r300, r600)
> GL_ARB_vertex_type_2_10_10_10_rev DONE (r600)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_context.c
> b/src/mesa/drivers/dri/i965/brw_context.c
> index a5711e4..f8d7643 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.c
> +++ b/src/mesa/drivers/dri/i965/brw_context.c
> @@ -222,6 +222,8 @@ brwCreateContext(int api,
> if (intel->gen >= 6)
> ctx->Const.QuadsFollowProvokingVertexConvention = false;
>
> + ctx->Const.QueryCounterBits.Timestamp = 36;
> +
> if (intel->is_g4x || intel->gen >= 5) {
> brw->CMD_VF_STATISTICS = GM45_3DSTATE_VF_STATISTICS;
> brw->CMD_PIPELINE_SELECT = CMD_PIPELINE_SELECT_GM45;
> diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c
> b/src/mesa/drivers/dri/i965/brw_queryobj.c
> index 3f9e065..87c8dac 100644
> --- a/src/mesa/drivers/dri/i965/brw_queryobj.c
> +++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
> @@ -41,6 +41,7 @@
> #include "main/imports.h"
>
> #include "brw_context.h"
> +#include "brw_defines.h"
> #include "brw_state.h"
> #include "intel_batchbuffer.h"
> #include "intel_reg.h"
> @@ -155,6 +156,32 @@ brw_queryobj_get_results(struct gl_context *ctx,
> query->Base.Result += 1000 * ((results[1] >> 32) - (results[0] >> 32));
> break;
>
> + case GL_TIMESTAMP:
> + if (intel->gen >= 6) {
> + /* Our timer is a clock that increments every 80ns (regardless of
> + * other clock scaling in the system). The timestamp register we
> can
> + * read for glGetTimestamp() masks out the top 32 bits, so we do
> that
> + * here too to let the two counters be compared against each other.
> + *
> + * If we just multiplied that 32 bits of data by 80, it would roll
> + * over at a non-power-of-two, so an application couldn't use
> + * GL_QUERY_COUNTER_BITS to handle rollover correctly. Instead, we
> + * report 36 bits and truncate at that (rolling over 5 times as
> often
> + * as the HW counter), and when the 32-bit counter rolls over, it
> + * happens to also be at a rollover in the reported value from near
> + * (1<<36) to 0.
> + *
> + * The low 32 bits rolls over in ~343 seconds. Our 36-bit result
> + * rolls over every ~69 seconds.
> + */
> + query->Base.Result = 80 * (results[1] & 0xffffffff);
> + query->Base.Result &= (1ull << 36) - 1;
> + } else {
> + query->Base.Result = 1000 * (results[1] >> 32);
> + }
> +
> + break;
> +
> case GL_SAMPLES_PASSED_ARB:
> /* Map and count the pixels from the current query BO */
> for (i = query->first_index; i <= query->last_index; i++) {
> @@ -262,6 +289,12 @@ brw_end_query(struct gl_context *ctx, struct
> gl_query_object *q)
> struct brw_query_object *query = (struct brw_query_object *)q;
>
> switch (query->Base.Target) {
> + case GL_TIMESTAMP:
> + drm_intel_bo_unreference(query->bo);
> + query->bo = drm_intel_bo_alloc(intel->bufmgr, "timer query",
> + 4096, 4096);
> + /* FALLTHROUGH */
> +
> case GL_TIME_ELAPSED_EXT:
> write_timestamp(intel, query->bo, 1);
> intel_batchbuffer_flush(intel);
> @@ -404,6 +437,22 @@ brw_emit_query_end(struct brw_context *brw)
> brw->query.index++;
> }
>
> +static uint64_t
> +brw_get_timestamp(struct gl_context *ctx)
> +{
> + struct intel_context *intel = intel_context(ctx);
> + uint64_t result = 0;
> +
> + drm_intel_reg_read(intel->bufmgr, TIMESTAMP, &result);
> +
> + /* See logic in brw_queryobj_get_results() */
> + result = result >> 32;
> + result *= 80;
> + result &= (1ull << 36) - 1;
> +
> + return result;
> +}
> +
> void brw_init_queryobj_functions(struct dd_function_table *functions)
> {
> functions->NewQueryObject = brw_new_query_object;
> @@ -412,4 +461,5 @@ void brw_init_queryobj_functions(struct dd_function_table
> *functions)
> functions->EndQuery = brw_end_query;
> functions->CheckQuery = brw_check_query;
> functions->WaitQuery = brw_wait_query;
> + functions->GetTimestamp = brw_get_timestamp;
> }
> diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c
> b/src/mesa/drivers/dri/intel/intel_extensions.c
> index 5a813b0..4a964c6 100755
> --- a/src/mesa/drivers/dri/intel/intel_extensions.c
> +++ b/src/mesa/drivers/dri/intel/intel_extensions.c
> @@ -31,6 +31,7 @@
> #include "intel_chipset.h"
> #include "intel_context.h"
> #include "intel_extensions.h"
> +#include "intel_reg.h"
> #include "utils.h"
>
> /**
> @@ -111,6 +112,13 @@ intelInitExtensions(struct gl_context *ctx)
> if (intel->gen >= 5)
> ctx->Extensions.EXT_timer_query = true;
>
> + if (intel->gen >= 7) {
> + uint64_t dummy;
> + /* Test if the kernel has the ioctl. */
> + if (drm_intel_reg_read(intel->bufmgr, TIMESTAMP, &dummy) == 0)
> + ctx->Extensions.ARB_timer_query = true;
> + }
> +
> if (intel->gen >= 4) {
> ctx->Extensions.ARB_color_buffer_float = true;
> ctx->Extensions.ARB_depth_buffer_float = true;
> diff --git a/src/mesa/drivers/dri/intel/intel_reg.h
> b/src/mesa/drivers/dri/intel/intel_reg.h
> index 2c75a8e..53b1cb9 100644
> --- a/src/mesa/drivers/dri/intel/intel_reg.h
> +++ b/src/mesa/drivers/dri/intel/intel_reg.h
> @@ -275,3 +275,5 @@
> #define SO_NUM_PRIMS_WRITTEN1_IVB 0x5208
> #define SO_NUM_PRIMS_WRITTEN2_IVB 0x5210
> #define SO_NUM_PRIMS_WRITTEN3_IVB 0x5218
> +
> +#define TIMESTAMP 0x2358
>
Looks good. I also enabled and tested the extension on Sandybridge and
it looks good, so you can drop it down to gen >= 6.
For the series:
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
