drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
Subsystems (2)
PATCH v3 1/2 drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
SAMPLE_OA_REPORT enables sampling of OA reports from the OA buffer. Since reports from OA buffer had system wide visibility, collecting samples from the OA buffer was a privileged operation on previous platforms. Prior to TGL, it was also necessary to sample the OA buffer to normalize reports from MI REPORT PERF COUNT.
TGL has a dedicated OAR unit to sample perf reports for a specific render context. This removes the necessity to sample OA buffer.
- If not sampling the OA buffer, allow non-privileged access. An earlier patch allows the non-privilege access:
https://patchwork.freedesktop.org/patch/337716/?series=68582&rev=1
- Clear up the path for non-privileged access in this patch
--- drivers/gpu/drm/i915/i915_perf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +3 -2
@@ -2720,7 +2720,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,return -EINVAL ; } -if (!(props->sample_flags &SAMPLE_OA_REPORT )) { +if (!(props->sample_flags &SAMPLE_OA_REPORT ) && + (INTEL_GEN (perf->i915) <12 || !stream->ctx)) {DRM_DEBUG ("Only OA report sampling supported\n" );return -EINVAL ; }
@@ -2752,7 +2753,7 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, format_size = perf->oa_formats[props->oa_format].size; - stream->sample_flags |=SAMPLE_OA_REPORT ; + stream->sample_flags = props->sample_flags; stream->sample_size += format_size; stream->oa_buffer.format_size = format_size;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/2 drm/i915/perf: Configure OAR for specific context
Gen12 supports saving/restoring render counters per context. Apply OAR configuration only for the context that is passed in to perf.
v2:
- Fix OACTXCONTROL value to only stop/resume counters.
- Remove gen12_update_reg_state_unlocked as power state is already applied by the caller.
v3: (Lionel)
- Move register initialization into the array
- Assume a valid oa_config in enable_metric_set
--- drivers/gpu/drm/i915/i915_perf.c | 199 +++++++++++++++++-------------- 1 file changed, 112 insertions(+), 87 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +112 -87
@@ -2080,20 +2080,12 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce,u32 *reg_state = ce->lrc_reg_state;int i; -if (IS_GEN (stream->perf->i915,12 )) { -u32 format = stream->oa_buffer.format; + reg_state[ctx_oactxctrl +1 ] = + (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | + (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | +GEN8_OA_COUNTER_RESUME ; - reg_state[ctx_oactxctrl +1 ] = - (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | - (stream->oa_config ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ); - }else { - reg_state[ctx_oactxctrl +1 ] = - (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | - (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | -GEN8_OA_COUNTER_RESUME ; - } - -for (i =0 ; !!ctx_flexeu0 && i <ARRAY_SIZE (flex_regs); i++) +for (i =0 ; i <ARRAY_SIZE (flex_regs); i++) reg_state[ctx_flexeu0 + i *2 +1 ] =oa_config_flex_reg (stream->oa_config, flex_regs[i]);
@@ -2226,34 +2218,51 @@ static int gen8_configure_context(struct i915_gem_context *ctx,return err; } -static int gen12_emit_oar_config (struct intel_context *ce,bool enable) +static int gen12_configure_oar_context (struct i915_perf_stream *stream,bool enable) { -struct i915_request *rq; -u32 *cs; -int err =0 ; - - rq =i915_request_create (ce); -if (IS_ERR (rq)) -return PTR_ERR (rq); - - cs =intel_ring_begin (rq,4 ); -if (IS_ERR (cs)) { - err =PTR_ERR (cs); - goto out; - } - - *cs++ =MI_LOAD_REGISTER_IMM (1 ); - *cs++ =i915_mmio_reg_offset (RING_CONTEXT_CONTROL (ce->engine->mmio_base)); - *cs++ =_MASKED_FIELD (GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE , - enable ?GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE :0 ); - *cs++ =MI_NOOP ; +int err; +struct intel_context *ce = stream->pinned_ctx; +u32 format = stream->oa_buffer.format; +struct flex regs_context[] = { + { +GEN8_OACTXCONTROL , + stream->perf->ctx_oactxctrl_offset +1 , + enable ?GEN8_OA_COUNTER_RESUME :0 , + }, + }; +/* Offsets in regs_lri are not used since this configuration is only +* applied using LRI. Initialize the correct offsets for posterity. +*/ +#define GEN12_OAR_OACONTROL_OFFSET 0x5B0 +struct flex regs_lri[] = { + { +GEN12_OAR_OACONTROL , +GEN12_OAR_OACONTROL_OFFSET +1 , + (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | + (enable ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ) + }, + { +RING_CONTEXT_CONTROL (ce->engine->mmio_base), +CTX_CONTEXT_CONTROL , +_MASKED_FIELD (GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE , + enable ? +GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE : +0 ) + }, + }; -intel_ring_advance (rq, cs); +/* Modify the context image of pinned context with regs_context*/ + err =intel_context_lock_pinned (ce); +if (err) +return err; -out: -i915_request_add (rq); + err =gen8_modify_context (ce, regs_context,ARRAY_SIZE (regs_context)); +intel_context_unlock_pinned (ce); +if (err) +return err; -return err; +/* Apply regs_lri using LRI with pinned context */ +return gen8_modify_self (ce, regs_lri,ARRAY_SIZE (regs_lri)); }/*
@@ -2279,53 +2288,16 @@ static int gen12_emit_oar_config(struct intel_context *ce, bool enable)* per-context OA state. * * Note: it's only the RCS/Render context that has any OA state. +* Note: the first flex register passed must always be R_PWR_CLK_STATE */ -static int lrc_configure_all_contexts (struct i915_perf_stream *stream, -const struct i915_oa_config *oa_config) +static int oa_configure_all_contexts (struct i915_perf_stream *stream, +struct flex *regs, +size_t num_regs) {struct drm_i915_private *i915 = stream->perf->i915; -/* The MMIO offsets for Flex EU registers aren't contiguous */ -const u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset; -#define ctx_flexeuN (N ) (ctx_flexeu0 + 2 * (N) + 1) -struct flex regs[] = { - { -GEN8_R_PWR_CLK_STATE , -CTX_R_PWR_CLK_STATE , - }, - { -IS_GEN (i915,12 ) ? -GEN12_OAR_OACONTROL :GEN8_OACTXCONTROL , - stream->perf->ctx_oactxctrl_offset +1 , - }, - {EU_PERF_CNTL0 ,ctx_flexeuN (0 ) }, - {EU_PERF_CNTL1 ,ctx_flexeuN (1 ) }, - {EU_PERF_CNTL2 ,ctx_flexeuN (2 ) }, - {EU_PERF_CNTL3 ,ctx_flexeuN (3 ) }, - {EU_PERF_CNTL4 ,ctx_flexeuN (4 ) }, - {EU_PERF_CNTL5 ,ctx_flexeuN (5 ) }, - {EU_PERF_CNTL6 ,ctx_flexeuN (6 ) }, - }; -#undef ctx_flexeuNstruct intel_engine_cs *engine;struct i915_gem_context *ctx, *cn; -size_t array_size =IS_GEN (i915,12 ) ?2 :ARRAY_SIZE (regs); -int i, err; - -if (IS_GEN (i915,12 )) { -u32 format = stream->oa_buffer.format; - - regs[1 ].value = - (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | - (oa_config ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ); - }else { - regs[1 ].value = - (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | - (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | -GEN8_OA_COUNTER_RESUME ; - } - -for (i =2 ; !!ctx_flexeu0 && i < array_size; i++) - regs[i].value =oa_config_flex_reg (oa_config, regs[i].reg); +int err;lockdep_assert_held (&stream->perf->lock);
@@ -2355,7 +2327,7 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream,spin_unlock (&i915->gem.contexts.lock); - err =gen8_configure_context (ctx, regs, array_size); + err =gen8_configure_context (ctx, regs, num_regs);if (err) {i915_gem_context_put (ctx);return err;
@@ -2380,7 +2352,7 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream, regs[0 ].value =intel_sseu_make_rpcs (i915, &ce->sseu); - err =gen8_modify_self (ce, regs, array_size); + err =gen8_modify_self (ce, regs, num_regs);if (err)return err; }
@@ -2388,6 +2360,56 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream,return 0 ; } +static int gen12_configure_all_contexts (struct i915_perf_stream *stream, +const struct i915_oa_config *oa_config) +{ +struct flex regs[] = { + { +GEN8_R_PWR_CLK_STATE , +CTX_R_PWR_CLK_STATE , + }, + }; + +return oa_configure_all_contexts (stream, regs,ARRAY_SIZE (regs)); +} + +static int lrc_configure_all_contexts (struct i915_perf_stream *stream, +const struct i915_oa_config *oa_config) +{ +/* The MMIO offsets for Flex EU registers aren't contiguous */ +const u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset; +#define ctx_flexeuN (N ) (ctx_flexeu0 + 2 * (N) + 1) +struct flex regs[] = { + { +GEN8_R_PWR_CLK_STATE , +CTX_R_PWR_CLK_STATE , + }, + { +GEN8_OACTXCONTROL , + stream->perf->ctx_oactxctrl_offset +1 , + }, + {EU_PERF_CNTL0 ,ctx_flexeuN (0 ) }, + {EU_PERF_CNTL1 ,ctx_flexeuN (1 ) }, + {EU_PERF_CNTL2 ,ctx_flexeuN (2 ) }, + {EU_PERF_CNTL3 ,ctx_flexeuN (3 ) }, + {EU_PERF_CNTL4 ,ctx_flexeuN (4 ) }, + {EU_PERF_CNTL5 ,ctx_flexeuN (5 ) }, + {EU_PERF_CNTL6 ,ctx_flexeuN (6 ) }, + }; +#undef ctx_flexeuN +int i; + + regs[1 ].value = + (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | + (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | +GEN8_OA_COUNTER_RESUME ; + +for (i =2 ; i <ARRAY_SIZE (regs); i++) + regs[i].value =oa_config_flex_reg (oa_config, regs[i].reg); + +return oa_configure_all_contexts (stream, regs,ARRAY_SIZE (regs)); +} +static int gen8_enable_metric_set (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore;
@@ -2471,7 +2493,7 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream)* to make sure all slices/subslices are ON before writing to NOA * registers. */ - ret =lrc_configure_all_contexts (stream, oa_config); + ret =gen12_configure_all_contexts (stream, oa_config);if (ret)return ret;
@@ -2481,8 +2503,7 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream)* requested this. */ if (stream->ctx) { - ret =gen12_emit_oar_config (stream->pinned_ctx, - oa_config !=NULL ); + ret =gen12_configure_oar_context (stream, true);if (ret)return ret; }
@@ -2516,11 +2537,11 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream)struct intel_uncore *uncore = stream->uncore;/* Reset all contexts' slices/subslices configurations. */ -lrc_configure_all_contexts (stream,NULL ); +gen12_configure_all_contexts (stream,NULL );/* disable the context save/restore or OAR counters */ if (stream->ctx) -gen12_emit_oar_config (stream->pinned_ctx, false); +gen12_configure_oar_context (stream, false);/* Make sure we disable noa to save power. */ intel_uncore_rmw (uncore,RPM_CONFIG1 ,GEN10_GT_NOA_ENABLE ,0 );
@@ -2862,7 +2883,11 @@ void i915_oa_init_reg_state(const struct intel_context *ce,return ; stream = engine->i915->perf.exclusive_stream; -if (stream) +/* +* For gen12, only CTX_R_PWR_CLK_STATE needs update, but the caller +* is already doing that, so nothing to be done for gen12 here. +*/ +if (stream &&INTEL_GEN (stream->perf->i915) <12 )gen8_update_reg_state_unlocked (ce, stream); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 2/2] drm/i915/perf: Configure OAR for specific context
Quoted 8 lines · Umesh Nerlige Ramappa
Gen12 supports saving/restoring render counters per context. Apply OAR configuration only for the context that is passed in to perf.
v2:
- Fix OACTXCONTROL value to only stop/resume counters.
- Removegen12_update_reg_state_unlockedas power state is already applied by the caller.
Quoted 5 lines
v3: (Lionel)
- Move register initialization into the array
- Assume a validoa_configinenable_metric_setSigned-off-by Umesh Nerlige Ramappa <[email protected]>
Looks all good, thanks!
Quoted 284 lines
--- drivers/gpu/drm/i915/i915_perf.c | 199 +++++++++++++++++-------------- 1 file changed, 112 insertions(+), 87 deletions(-)drivers/gpu/drm/i915/i915_perf.c +107
-86@@ -2080,20 +2080,12 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce,u32 *reg_state = ce->lrc_reg_state;int i; -if (IS_GEN (stream->perf->i915,12 )) { -u32 format = stream->oa_buffer.format; + reg_state[ctx_oactxctrl +1 ] = + (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | + (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | +GEN8_OA_COUNTER_RESUME ; - reg_state[ctx_oactxctrl +1 ] = - (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | - (stream->oa_config ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ); - }else { - reg_state[ctx_oactxctrl +1 ] = - (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | - (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | -GEN8_OA_COUNTER_RESUME ; - } - -for (i =0 ; !!ctx_flexeu0 && i <ARRAY_SIZE (flex_regs); i++) +for (i =0 ; i <ARRAY_SIZE (flex_regs); i++) reg_state[ctx_flexeu0 + i *2 +1 ] =oa_config_flex_reg (stream->oa_config, flex_regs[i]);@@ -2226,34 +2218,51 @@ static int gen8_configure_context(struct i915_gem_context *ctx,return err; } -static int gen12_emit_oar_config (struct intel_context *ce,bool enable) +static int gen12_configure_oar_context (struct i915_perf_stream *stream,bool enable) { -struct i915_request *rq; -u32 *cs; -int err =0 ; - - rq =i915_request_create (ce); -if (IS_ERR (rq)) -return PTR_ERR (rq); - - cs =intel_ring_begin (rq,4 ); -if (IS_ERR (cs)) { - err =PTR_ERR (cs); - goto out; - } - - *cs++ =MI_LOAD_REGISTER_IMM (1 ); - *cs++ =i915_mmio_reg_offset (RING_CONTEXT_CONTROL (ce->engine->mmio_base)); - *cs++ =_MASKED_FIELD (GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE , - enable ?GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE :0 ); - *cs++ =MI_NOOP ; +int err; +struct intel_context *ce = stream->pinned_ctx; +u32 format = stream->oa_buffer.format; +struct flex regs_context[] = { + { +GEN8_OACTXCONTROL , + stream->perf->ctx_oactxctrl_offset +1 , + enable ?GEN8_OA_COUNTER_RESUME :0 , + }, + }; +/* Offsets in regs_lri are not used since this configuration is only +* applied using LRI. Initialize the correct offsets for posterity. +*/ +#define GEN12_OAR_OACONTROL_OFFSET 0x5B0 +struct flex regs_lri[] = { + { +GEN12_OAR_OACONTROL , +GEN12_OAR_OACONTROL_OFFSET +1 , + (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | + (enable ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ) + }, + { +RING_CONTEXT_CONTROL (ce->engine->mmio_base), +CTX_CONTEXT_CONTROL , +_MASKED_FIELD (GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE , + enable ? +GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE : +0 ) + }, + }; -intel_ring_advance (rq, cs); +/* Modify the context image of pinned context with regs_context*/ + err =intel_context_lock_pinned (ce); +if (err) +return err; -out: -i915_request_add (rq); + err =gen8_modify_context (ce, regs_context,ARRAY_SIZE (regs_context)); +intel_context_unlock_pinned (ce); +if (err) +return err; -return err; +/* Apply regs_lri using LRI with pinned context */ +return gen8_modify_self (ce, regs_lri,ARRAY_SIZE (regs_lri)); }/* @@ -2279,53 +2288,16 @@ static int gen12_emit_oar_config(struct intel_context *ce, bool enable)* per-context OA state. * * Note: it's only the RCS/Render context that has any OA state. +* Note: the first flex register passed must always be R_PWR_CLK_STATE */ -static int lrc_configure_all_contexts (struct i915_perf_stream *stream, -const struct i915_oa_config *oa_config) +static int oa_configure_all_contexts (struct i915_perf_stream *stream, +struct flex *regs, +size_t num_regs) {struct drm_i915_private *i915 = stream->perf->i915; -/* The MMIO offsets for Flex EU registers aren't contiguous */ -const u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset; -#define ctx_flexeuN (N ) (ctx_flexeu0 + 2 * (N) + 1) -struct flex regs[] = { - { -GEN8_R_PWR_CLK_STATE , -CTX_R_PWR_CLK_STATE , - }, - { -IS_GEN (i915,12 ) ? -GEN12_OAR_OACONTROL :GEN8_OACTXCONTROL , - stream->perf->ctx_oactxctrl_offset +1 , - }, - {EU_PERF_CNTL0 ,ctx_flexeuN (0 ) }, - {EU_PERF_CNTL1 ,ctx_flexeuN (1 ) }, - {EU_PERF_CNTL2 ,ctx_flexeuN (2 ) }, - {EU_PERF_CNTL3 ,ctx_flexeuN (3 ) }, - {EU_PERF_CNTL4 ,ctx_flexeuN (4 ) }, - {EU_PERF_CNTL5 ,ctx_flexeuN (5 ) }, - {EU_PERF_CNTL6 ,ctx_flexeuN (6 ) }, - }; -#undef ctx_flexeuNstruct intel_engine_cs *engine;struct i915_gem_context *ctx, *cn; -size_t array_size =IS_GEN (i915,12 ) ?2 :ARRAY_SIZE (regs); -int i, err; - -if (IS_GEN (i915,12 )) { -u32 format = stream->oa_buffer.format; - - regs[1 ].value = - (format <<GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT ) | - (oa_config ?GEN12_OAR_OACONTROL_COUNTER_ENABLE :0 ); - }else { - regs[1 ].value = - (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | - (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | -GEN8_OA_COUNTER_RESUME ; - } - -for (i =2 ; !!ctx_flexeu0 && i < array_size; i++) - regs[i].value =oa_config_flex_reg (oa_config, regs[i].reg); +int err;lockdep_assert_held (&stream->perf->lock);@@ -2355,7 +2327,7 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream,spin_unlock (&i915->gem.contexts.lock); - err =gen8_configure_context (ctx, regs, array_size); + err =gen8_configure_context (ctx, regs, num_regs);if (err) {i915_gem_context_put (ctx);return err;@@ -2380,7 +2352,7 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream, regs[0 ].value =intel_sseu_make_rpcs (i915, &ce->sseu); - err =gen8_modify_self (ce, regs, array_size); + err =gen8_modify_self (ce, regs, num_regs);if (err)return err; }@@ -2388,6 +2360,56 @@ static int lrc_configure_all_contexts(struct i915_perf_stream *stream,return 0 ; } +static int gen12_configure_all_contexts (struct i915_perf_stream *stream, +const struct i915_oa_config *oa_config) +{ +struct flex regs[] = { + { +GEN8_R_PWR_CLK_STATE , +CTX_R_PWR_CLK_STATE , + }, + }; + +return oa_configure_all_contexts (stream, regs,ARRAY_SIZE (regs)); +} + +static int lrc_configure_all_contexts (struct i915_perf_stream *stream, +const struct i915_oa_config *oa_config) +{ +/* The MMIO offsets for Flex EU registers aren't contiguous */ +const u32 ctx_flexeu0 = stream->perf->ctx_flexeu0_offset; +#define ctx_flexeuN (N ) (ctx_flexeu0 + 2 * (N) + 1) +struct flex regs[] = { + { +GEN8_R_PWR_CLK_STATE , +CTX_R_PWR_CLK_STATE , + }, + { +GEN8_OACTXCONTROL , + stream->perf->ctx_oactxctrl_offset +1 , + }, + {EU_PERF_CNTL0 ,ctx_flexeuN (0 ) }, + {EU_PERF_CNTL1 ,ctx_flexeuN (1 ) }, + {EU_PERF_CNTL2 ,ctx_flexeuN (2 ) }, + {EU_PERF_CNTL3 ,ctx_flexeuN (3 ) }, + {EU_PERF_CNTL4 ,ctx_flexeuN (4 ) }, + {EU_PERF_CNTL5 ,ctx_flexeuN (5 ) }, + {EU_PERF_CNTL6 ,ctx_flexeuN (6 ) }, + }; +#undef ctx_flexeuN +int i; + + regs[1 ].value = + (stream->period_exponent <<GEN8_OA_TIMER_PERIOD_SHIFT ) | + (stream->periodic ?GEN8_OA_TIMER_ENABLE :0 ) | +GEN8_OA_COUNTER_RESUME ; + +for (i =2 ; i <ARRAY_SIZE (regs); i++) + regs[i].value =oa_config_flex_reg (oa_config, regs[i].reg); + +return oa_configure_all_contexts (stream, regs,ARRAY_SIZE (regs)); +} +static int gen8_enable_metric_set (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore;@@ -2471,7 +2493,7 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream)* to make sure all slices/subslices are ON before writing to NOA * registers. */ - ret =lrc_configure_all_contexts (stream, oa_config); + ret =gen12_configure_all_contexts (stream, oa_config);if (ret)return ret;@@ -2481,8 +2503,7 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream)* requested this. */ if (stream->ctx) { - ret =gen12_emit_oar_config (stream->pinned_ctx, - oa_config !=NULL ); + ret =gen12_configure_oar_context (stream, true);if (ret)return ret; }@@ -2516,11 +2537,11 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream)struct intel_uncore *uncore = stream->uncore;/* Reset all contexts' slices/subslices configurations. */ -lrc_configure_all_contexts (stream,NULL ); +gen12_configure_all_contexts (stream,NULL );/* disable the context save/restore or OAR counters */ if (stream->ctx) -gen12_emit_oar_config (stream->pinned_ctx, false); +gen12_configure_oar_context (stream, false);/* Make sure we disable noa to save power. */ intel_uncore_rmw (uncore,RPM_CONFIG1 ,GEN10_GT_NOA_ENABLE ,0 );@@ -2862,7 +2883,11 @@ void i915_oa_init_reg_state(const struct intel_context *ce,return ;
drivers/gpu/drm/i915/i915_perf.c void i915_oa_init_reg_state(const struct intel_context *ce, · line 2893
Quoted 10 lines
drivers/gpu/drm/i915/i915_perf.c +5
-1stream = engine->i915->perf.exclusive_stream; -if (stream) +/* +* For gen12, only CTX_R_PWR_CLK_STATE needs update, but the caller +* is already doing that, so nothing to be done for gen12 here. +*/ +if (stream &&INTEL_GEN (stream->perf->i915) <12 )gen8_update_reg_state_unlocked (ce, stream); }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 2/2] drm/i915/perf: Configure OAR for specific context
Quoted 13 lines · Lionel Landwerlin
Quoted 12 lines · Umesh Nerlige Ramappa
Gen12 supports saving/restoring render counters per context. Apply OAR configuration only for the context that is passed in to perf.
v2:
- Fix OACTXCONTROL value to only stop/resume counters.
- Removegen12_update_reg_state_unlockedas power state is already applied by the caller.v3: (Lionel)
- Move register initialization into the array
- Assume a validoa_configinenable_metric_set
Quoted 6 lines
Quoted 1 line
Signed-off-by Umesh Nerlige Ramappa <[email protected]>Looks all good, thanks!
Reviewed-by Lionel Landwerlin <[email protected]>
I forgot to mention we surely want to add this tag :
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v3,1/2] drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [v3,1/2] drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
URL : https://patchwork.freedesktop.org/series/69645/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7367 -> Patchwork_15321
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/index.html
Known issues
------------
Here are the changes found in Patchwork_15321 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_gem_contexts:
- fi-bsw-nick: [PASS][1] -> [INCOMPLETE][2] ([fdo# 111542])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/fi-bsw-nick/igt@i915_selftest@live_gem_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/fi-bsw-nick/igt@i915_selftest@live_gem_contexts.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][3] -> [FAIL][4] ([fdo#111045] / [fdo#111096])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/fi-kbl-7500u/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live_blt:
- fi-bsw-n3050: [DMESG-FAIL][5] ([fdo#112176]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/fi-bsw-n3050/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/fi-bsw-n3050/igt@i915_selftest@live_blt.html
#### Warnings ####
* igt@i915_selftest@live_blt:
- fi-hsw-peppy: [DMESG-FAIL][7] ([fdo#112225]) -> [DMESG-FAIL][8] ([fdo#112147])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/fi-hsw-peppy/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/fi-hsw-peppy/igt@i915_selftest@live_blt.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo# 111542]: https://bugs.freedesktop.org/show_bug.cgi?id= 111542 [fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#112147]: https://bugs.freedesktop.org/show_bug.cgi?id=112147
[fdo#112176]: https://bugs.freedesktop.org/show_bug.cgi?id=112176
[fdo#112225]: https://bugs.freedesktop.org/show_bug.cgi?id=112225
[fdo#112298]: https://bugs.freedesktop.org/show_bug.cgi?id=112298
Participating hosts (49 -> 44)
------------------------------
Missing (5): fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7367 -> Patchwork_15321
CI-20190529: 20190529
CI_DRM_7367: db6c0570abdebad7d56bf88eb15ad3b51dad4699 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5293: 4bb46f08f7cb6485642c4351cecdad93072d27a0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15321: 8dfd10de1f20c7038c06e6c1ea431f615dc12be4 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
8dfd10de1f20 drm/i915/perf: Configure OAR for specific context 42af01a7a00e drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [v3,1/2] drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: series starting with [v3,1/2] drm/i915/perf: Allow non-privileged access when OA buffer is not sampled
URL : https://patchwork.freedesktop.org/series/69645/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7367_full -> Patchwork_15321_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15321_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_15321_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15321_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_eio@wait-wedge-1us:
- shard-skl: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-skl3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-skl7/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_15321_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@vcs1-mixed-process:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276] / [fdo#112080]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb6/igt@[email protected]
* igt@gem_eio@suspend:
- shard-tglb: [PASS][5] -> [INCOMPLETE][6] ([fdo#111850]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb8/igt@[email protected]
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#112080]) +6 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb3/igt@[email protected]
* igt@gem_exec_schedule@pi-ringfull-bsd:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#112146]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-chain-vebox:
- shard-tglb: [PASS][11] -> [INCOMPLETE][12] ([fdo#111677])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb3/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb6/igt@[email protected]
* igt@gem_exec_suspend@basic-s0:
- shard-tglb: [PASS][13] -> [INCOMPLETE][14] ([fdo#111832]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb7/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-hsw: [PASS][15] -> [DMESG-WARN][16] ([fdo#111870])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-hsw5/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-hsw1/igt@[email protected]
* igt@i915_pm_dc@dc6-dpms:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#111830 ])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb3/igt@[email protected]
* igt@i915_selftest@live_hangcheck:
- shard-hsw: [PASS][19] -> [DMESG-FAIL][20] ([fdo#111991])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-hsw6/igt@i915_selftest@live_hangcheck.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-hsw6/igt@i915_selftest@live_hangcheck.html
* igt@kms_color@pipe-b-ctm-0-25:
- shard-skl: [PASS][21] -> [DMESG-WARN][22] ([fdo#106107])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-skl3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-skl2/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [PASS][23] -> [DMESG-WARN][24] ([fdo#108566])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-apl6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-apl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][25] -> [DMESG-WARN][26] ([fdo#108566]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-kbl4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-kbl2/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
- shard-hsw: [PASS][27] -> [FAIL][28] ([fdo#105767])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-hsw4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-hsw8/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-tglb: [PASS][29] -> [FAIL][30] ([fdo#102670])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb5/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb8/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [PASS][31] -> [FAIL][32] ([fdo#105363])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-glk5/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-glk2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt:
- shard-tglb: [PASS][33] -> [FAIL][34] ([fdo#103167]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb5/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [PASS][35] -> [FAIL][36] ([fdo#103167]) +8 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-skl: [PASS][37] -> [INCOMPLETE][38] ([fdo#104108] / [fdo#106978])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-skl1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-skl9/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][39] -> [FAIL][40] ([fdo#108145] / [fdo#110403])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-skl10/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-skl6/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][41] -> [SKIP][42] ([fdo#109441]) +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb5/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_psr@psr2_suspend:
- shard-tglb: [PASS][43] -> [DMESG-WARN][44] ([fdo#111600])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb1/igt@kms_psr@psr2_suspend.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb6/igt@kms_psr@psr2_suspend.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][45] -> [FAIL][46] ([fdo#99912])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-apl2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-apl6/igt@[email protected]
- shard-glk: [PASS][47] -> [FAIL][48] ([fdo#99912])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-glk2/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-glk8/igt@[email protected]
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-tglb: [PASS][49] -> [INCOMPLETE][50] ([fdo#111832] / [fdo#111850]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb7/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb4/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [PASS][51] -> [SKIP][52] ([fdo#109276]) +9 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb6/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-tglb: [INCOMPLETE][53] ([fdo#111832]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb6/igt@[email protected]
* igt@gem_ctx_persistence@vcs1-queued:
- shard-iclb: [SKIP][55] ([fdo#109276] / [fdo#112080]) -> [PASS][56] +3 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb3/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb4/igt@[email protected]
* igt@gem_ctx_switch@vcs1-heavy-queue:
- shard-iclb: [SKIP][57] ([fdo#112080]) -> [PASS][58] +8 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb8/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb1/igt@[email protected]
* igt@gem_exec_reuse@single:
- shard-tglb: [INCOMPLETE][59] ([fdo#111747]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb6/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb9/igt@[email protected]
* igt@gem_exec_schedule@in-order-bsd:
- shard-iclb: [SKIP][61] ([fdo#112146]) -> [PASS][62] +5 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb1/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb6/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd2:
- shard-tglb: [INCOMPLETE][63] ([fdo#111606] / [fdo#111677]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb6/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb7/igt@[email protected]
* igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive:
- shard-apl: [DMESG-FAIL][65] ([fdo#112309]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-apl2/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-apl6/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive.html
* igt@gem_persistent_relocs@forked-interruptible-thrash-inactive:
- shard-kbl: [TIMEOUT][67] ([fdo#112068 ]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-kbl1/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-kbl6/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-sync:
- shard-snb: [DMESG-WARN][69] ([fdo#111870]) -> [PASS][70] +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-snb1/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-snb4/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
- shard-hsw: [DMESG-WARN][71] ([fdo#111870]) -> [PASS][72] +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-hsw8/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-hsw4/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][73] ([fdo#111830 ]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb4/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb2/igt@[email protected]
* igt@i915_pm_rpm@system-suspend:
- shard-tglb: [INCOMPLETE][75] ([fdo#111747] / [fdo#111850]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb3/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb7/igt@[email protected]
* igt@i915_selftest@live_execlists:
- shard-glk: [TIMEOUT][77] -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-glk2/igt@i915_selftest@live_execlists.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-glk7/igt@i915_selftest@live_execlists.html
* igt@i915_suspend@debugfs-reader:
- shard-tglb: [INCOMPLETE][79] ([fdo#111832] / [fdo#111850]) -> [PASS][80] +2 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb4/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb1/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][81] ([fdo#108566]) -> [PASS][82] +1 similar issue
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-kbl2/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-kbl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-128x42-random:
- shard-skl: [FAIL][83] ([fdo#103232]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-skl6/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-skl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-tglb: [INCOMPLETE][85] ([fdo#111850]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb4/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb9/igt@[email protected]
* igt@kms_flip@2x-flip-vs-suspend-interruptible:
- shard-hsw: [INCOMPLETE][87] ([fdo#103540]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-hsw5/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-hsw5/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][89] ([fdo#105363]) -> [PASS][90] +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-skl6/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-skl2/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [DMESG-WARN][91] ([fdo#108566]) -> [PASS][92] +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-apl1/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-apl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-tglb: [INCOMPLETE][93] ([fdo#111832] / [fdo#111850] / [fdo#111884]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb5/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb9/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [FAIL][95] ([fdo#103167]) -> [PASS][96] +3 similar issues
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt:
- shard-tglb: [FAIL][97] ([fdo#103167]) -> [PASS][98] +4 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-tglb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][99] ([fdo#109441]) -> [PASS][100] +3 similar issues
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb4/igt@kms_psr@psr2_primary_page_flip.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@prime_vgem@wait-bsd2:
- shard-iclb: [SKIP][101] ([fdo#109276]) -> [PASS][102] +19 similar issues
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb3/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb2/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][103] ([fdo#111329]) -> [SKIP][104] ([fdo#109276] / [fdo#112080])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7367/shard-iclb2/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/shard-iclb5/igt@[email protected]
* igt@gem_ctx_isolation@vcs2-s3:
- shard-tglb: [SKIP][105] ([fdo#112080]) -> [SKIP][106] ([fdo#111912] / [fdo#112080])
[
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15321/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Umesh Nerlige Ramappa
SAMPLE_OA_REPORTenables sampling of OA reports from the OA buffer. Since reports from OA buffer had system wide visibility, collecting samples from the OA buffer was a privileged operation on previous platforms. Prior to TGL, it was also necessary to sample the OA buffer to normalize reports from MI REPORT PERF COUNT.TGL has a dedicated OAR unit to sample perf reports for a specific render context. This removes the necessity to sample OA buffer.
Quoted 6 lines
- If not sampling the OA buffer, allow non-privileged access. An earlier patch allows the non-privilege access:
https://patchwork.freedesktop.org/patch/337716/?series=68582&rev=1- Clear up the path for non-privileged access in this patch
Signed-off-by Umesh Nerlige Ramappa <[email protected]>
Quoted 19 lines
--- drivers/gpu/drm/i915/i915_perf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_perf.c +2
-1@@ -2720,7 +2720,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,return -EINVAL ; } -if (!(props->sample_flags &SAMPLE_OA_REPORT )) { +if (!(props->sample_flags &SAMPLE_OA_REPORT ) && + (INTEL_GEN (perf->i915) <12 || !stream->ctx)) {DRM_DEBUG ("Only OA report sampling supported\n" );return -EINVAL ; }
drivers/gpu/drm/i915/i915_perf.c static int i915_oa_stream_init(struct i915_perf_stream *stream, · line 2759
Quoted 8 lines
drivers/gpu/drm/i915/i915_perf.c +1
-1@@ -2752,7 +2753,7 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, format_size = perf->oa_formats[props->oa_format].size; - stream->sample_flags |=SAMPLE_OA_REPORT ; + stream->sample_flags = props->sample_flags; stream->sample_size += format_size; stream->oa_buffer.format_size = format_size;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx