diff options
| author | Robert Bragg <robert@sixbynine.org> | 2017-06-13 12:23:02 +0100 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2017-06-14 12:31:57 -0700 |
| commit | 5182f646c7615ede9a9ba3ecd241f6cbe16829dc (patch) | |
| tree | 30e28294d31946b2fe651a6bbd7b219bc4ae19ef /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 3f488d99858d22f584e1734f317bfcff9dbdf4fd (diff) | |
| download | lwn-5182f646c7615ede9a9ba3ecd241f6cbe16829dc.tar.gz lwn-5182f646c7615ede9a9ba3ecd241f6cbe16829dc.zip | |
drm/i915/perf: Add 'render basic' Gen8+ OA unit configs
Adds a static OA unit, MUX, B Counter + Flex EU configurations for basic
render metrics on Broadwell, Cherryview, Skylake and Broxton. These are
auto generated from an XML description of metric sets, currently
maintained in gputop, ref:
https://github.com/rib/gputop
> gputop-data/oa-*.xml
> scripts/i915-perf-kernelgen.py
$ make -C gputop-data -f Makefile.xml WHITELIST=RenderBasic
v2: add newlines to debug messages + fix comment (Matthew Auld)
Signed-off-by: Robert Bragg <robert@sixbynine.org>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f04449f9b1d5..2faad94c9ef2 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2417,12 +2417,14 @@ struct drm_i915_private { int metrics_set; - const struct i915_oa_reg *mux_regs[1]; - int mux_regs_lens[1]; + const struct i915_oa_reg *mux_regs[2]; + int mux_regs_lens[2]; int n_mux_configs; const struct i915_oa_reg *b_counter_regs; int b_counter_regs_len; + const struct i915_oa_reg *flex_regs; + int flex_regs_len; struct { struct i915_vma *vma; |