Commit 701f8231 authored by Lionel Landwerlin's avatar Lionel Landwerlin
Browse files

drm/i915/perf: prune OA configs 



In the following commit we'll introduce loadable userspace
configs. This change reworks how configurations are handled in the
perf driver and retains only the test configurations in kernel space.

We now store the test config in dev_priv and resolve the id only once
when opening the perf stream. The OA config is then handled through a
pointer to the structure holding the configuration details.

v2: Rework how test configs are handled (Lionel)

v3: Use u32 to hold number of register (Matthew)

v4: Removed unused dev_priv->perf.oa.current_config variable (Matthew)

v5: Lock device when accessing exclusive_stream (Lionel)

v6: Ensure OACTXCONTROL is always reprogrammed (Lionel)

v7: Switch a couple of index variable from int to u32 (Matthew)

Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170803165812.2373-3-lionel.g.landwerlin@intel.com
parent 01d928e9

drivers/gpu/drm/i915/i915_drv.h

+24 −20
Original line number Diff line number Diff line
@@ -1921,6 +1921,22 @@ struct i915_oa_reg { 
	u32 value;

};



struct i915_oa_config {

	char uuid[UUID_STRING_LEN + 1];

	int id;



	const struct i915_oa_reg *mux_regs;

	u32 mux_regs_len;

	const struct i915_oa_reg *b_counter_regs;

	u32 b_counter_regs_len;

	const struct i915_oa_reg *flex_regs;

	u32 flex_regs_len;



	struct attribute_group sysfs_metric;

	struct attribute *attrs[2];

	struct device_attribute sysfs_metric_id;

};



struct i915_perf_stream;



/**
@@ -2033,6 +2049,11 @@ struct i915_perf_stream { 
	 * type of configured stream.

	 */

	const struct i915_perf_stream_ops *ops;



	/**

	 * @oa_config: The OA configuration used by the stream.

	 */

	struct i915_oa_config *oa_config;

};



/**
@@ -2056,21 +2077,14 @@ struct i915_oa_ops { 
	 */

	void (*init_oa_buffer)(struct drm_i915_private *dev_priv);



	/**

	 * @select_metric_set: The auto generated code that checks whether a

	 * requested OA config is applicable to the system and if so sets up

	 * the mux, oa and flex eu register config pointers according to the

	 * current dev_priv->perf.oa.metrics_set.

	 */

	int (*select_metric_set)(struct drm_i915_private *dev_priv);



	/**

	 * @enable_metric_set: Selects and applies any MUX configuration to set

	 * up the Boolean and Custom (B/C) counters that are part of the

	 * counter reports being sampled. May apply system constraints such as

	 * disabling EU clock gating as required.

	 */

	int (*enable_metric_set)(struct drm_i915_private *dev_priv);

	int (*enable_metric_set)(struct drm_i915_private *dev_priv,

				 const struct i915_oa_config *oa_config);



	/**

	 * @disable_metric_set: Remove system constraints associated with using
@@ -2452,16 +2466,7 @@ struct drm_i915_private { 
			int period_exponent;

			int timestamp_frequency;



			int metrics_set;



			const struct i915_oa_reg *mux_regs[6];

			int mux_regs_lens[6];

			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 i915_oa_config test_config;



			struct {

				struct i915_vma *vma;
@@ -2548,7 +2553,6 @@ struct drm_i915_private { 


			struct i915_oa_ops ops;

			const struct i915_oa_format *oa_formats;

			int n_builtin_sets;

		} oa;

	} perf;

drivers/gpu/drm/i915/i915_oa_bdw.c

+46 −5314

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_oa_bdw.h

+1 −7
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ 
#ifndef __I915_OA_BDW_H__

#define __I915_OA_BDW_H__



extern int i915_oa_n_builtin_metric_sets_bdw;



extern int i915_oa_select_metric_set_bdw(struct drm_i915_private *dev_priv);



extern int i915_perf_register_sysfs_bdw(struct drm_i915_private *dev_priv);



extern void i915_perf_unregister_sysfs_bdw(struct drm_i915_private *dev_priv);

extern void i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv);



#endif

drivers/gpu/drm/i915/i915_oa_bxt.c

+20 −2603

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_oa_bxt.h

+1 −7
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ 
#ifndef __I915_OA_BXT_H__

#define __I915_OA_BXT_H__



extern int i915_oa_n_builtin_metric_sets_bxt;



extern int i915_oa_select_metric_set_bxt(struct drm_i915_private *dev_priv);



extern int i915_perf_register_sysfs_bxt(struct drm_i915_private *dev_priv);



extern void i915_perf_unregister_sysfs_bxt(struct drm_i915_private *dev_priv);

extern void i915_perf_load_test_config_bxt(struct drm_i915_private *dev_priv);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE