* ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 0:06 [PATCH] drm/i915/pmu: Clear the previous sample value when parking Chris Wilson
@ 2017-11-23 0:25 ` Patchwork
2017-11-23 1:03 ` ✓ Fi.CI.IGT: " Patchwork
` (5 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2017-11-23 0:25 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/pmu: Clear the previous sample value when parking
URL : https://patchwork.freedesktop.org/series/34262/
State : success
== Summary ==
Series 34262v1 drm/i915/pmu: Clear the previous sample value when parking
https://patchwork.freedesktop.org/api/1.0/series/34262/revisions/1/mbox/
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:451s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:460s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:381s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:539s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:280s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:501s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:507s
fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:497s
fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:489s
fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:606s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:261s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:542s
fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:431s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:440s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:433s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:491s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:466s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:483s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:533s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:475s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:534s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:577s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:451s
fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:541s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:568s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:518s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:494s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:461s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:557s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:422s
Blacklisted hosts:
fi-cnl-y total:236 pass:211 dwarn:0 dfail:0 fail:0 skip:24
fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:492s
a3f080ee939e8befca924f1ab83deeabfa7ff98e drm-tip: 2017y-11m-22d-18h-37m-24s UTC integration manifest
aa4e00480a60 drm/i915/pmu: Clear the previous sample value when parking
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7245/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* ✓ Fi.CI.IGT: success for drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 0:06 [PATCH] drm/i915/pmu: Clear the previous sample value when parking Chris Wilson
2017-11-23 0:25 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-11-23 1:03 ` Patchwork
2017-11-23 6:56 ` [PATCH] " Tvrtko Ursulin
` (4 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2017-11-23 1:03 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/pmu: Clear the previous sample value when parking
URL : https://patchwork.freedesktop.org/series/34262/
State : success
== Summary ==
Test kms_flip:
Subgroup flip-vs-panning-vs-hang:
pass -> DMESG-WARN (shard-snb) fdo#103821
Test gem_busy:
Subgroup close-race:
fail -> PASS (shard-snb) fdo#103829
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623 +1
Subgroup fbc-1p-pri-indfb-multidraw:
incomplete -> PASS (shard-hsw) fdo#103167
fdo#103821 https://bugs.freedesktop.org/show_bug.cgi?id=103821
fdo#103829 https://bugs.freedesktop.org/show_bug.cgi?id=103829
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
shard-hsw total:2667 pass:1530 dwarn:1 dfail:0 fail:14 skip:1122 time:9590s
shard-snb total:2667 pass:1308 dwarn:2 dfail:0 fail:16 skip:1341 time:8103s
Blacklisted hosts:
shard-apl total:2645 pass:1667 dwarn:3 dfail:0 fail:20 skip:954 time:13218s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7245/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 0:06 [PATCH] drm/i915/pmu: Clear the previous sample value when parking Chris Wilson
2017-11-23 0:25 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-11-23 1:03 ` ✓ Fi.CI.IGT: " Patchwork
@ 2017-11-23 6:56 ` Tvrtko Ursulin
2017-11-23 7:15 ` Chris Wilson
2017-11-23 8:54 ` [PATCH v2] " Chris Wilson
` (3 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Tvrtko Ursulin @ 2017-11-23 6:56 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 23/11/2017 00:06, Chris Wilson wrote:
> When turning off the engines, and the pmu sampling, clear the previous
> value as the current measurement should be 0.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/i915_pmu.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
> index f1e932a3fb85..6f1316f5039a 100644
> --- a/drivers/gpu/drm/i915/i915_pmu.c
> +++ b/drivers/gpu/drm/i915/i915_pmu.c
> @@ -135,9 +135,18 @@ static bool pmu_needs_timer(struct drm_i915_private *i915, bool gpu_active)
>
> void i915_pmu_gt_parked(struct drm_i915_private *i915)
> {
> + struct intel_engine_cs *engine;
> + enum intel_engine_id id;
> +
> if (!i915->pmu.base.event_init)
> return;
>
> + for_each_engine(engine, i915, id) {
> + engine->pmu.sample[I915_SAMPLE_BUSY].prev = 0;
> + engine->pmu.sample[I915_SAMPLE_WAIT].prev = 0;
> + engine->pmu.sample[I915_SAMPLE_SEMA].prev = 0;
> + }
> +
> spin_lock_irq(&i915->pmu.lock);
> /*
> * Signal sampling timer to stop if only engine events are enabled and
>
Yes, this is indeed required.
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Mind if I change it to use a loop to I915_ENGINE_SAMPLE_MAX, and then
follow up with a patch which moves this define from uapi to i915_pmu.h?
Since during engine classes we realized "/* non-ABI */" enums do not
make sense in the uapi?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 6:56 ` [PATCH] " Tvrtko Ursulin
@ 2017-11-23 7:15 ` Chris Wilson
0 siblings, 0 replies; 15+ messages in thread
From: Chris Wilson @ 2017-11-23 7:15 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
Quoting Tvrtko Ursulin (2017-11-23 06:56:02)
>
> On 23/11/2017 00:06, Chris Wilson wrote:
> > When turning off the engines, and the pmu sampling, clear the previous
> > value as the current measurement should be 0.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_pmu.c | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
> > index f1e932a3fb85..6f1316f5039a 100644
> > --- a/drivers/gpu/drm/i915/i915_pmu.c
> > +++ b/drivers/gpu/drm/i915/i915_pmu.c
> > @@ -135,9 +135,18 @@ static bool pmu_needs_timer(struct drm_i915_private *i915, bool gpu_active)
> >
> > void i915_pmu_gt_parked(struct drm_i915_private *i915)
> > {
> > + struct intel_engine_cs *engine;
> > + enum intel_engine_id id;
> > +
> > if (!i915->pmu.base.event_init)
> > return;
> >
> > + for_each_engine(engine, i915, id) {
> > + engine->pmu.sample[I915_SAMPLE_BUSY].prev = 0;
> > + engine->pmu.sample[I915_SAMPLE_WAIT].prev = 0;
> > + engine->pmu.sample[I915_SAMPLE_SEMA].prev = 0;
> > + }
> > +
> > spin_lock_irq(&i915->pmu.lock);
> > /*
> > * Signal sampling timer to stop if only engine events are enabled and
> >
>
> Yes, this is indeed required.
>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Mind if I change it to use a loop to I915_ENGINE_SAMPLE_MAX, and then
> follow up with a patch which moves this define from uapi to i915_pmu.h?
> Since during engine classes we realized "/* non-ABI */" enums do not
> make sense in the uapi?
Sure. I also think you might want to take a look at how we might just
use the timer to finish the last incomplete sample and then turning it
off. As I started to get worried about the sampler running concurrently.
If we do something like that, we can then assume that we hold the rpm
wakeref for the sampler, as it will only be running while gt.awake.
So whilst something like this is required, this is only a step in the
right direction.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 0:06 [PATCH] drm/i915/pmu: Clear the previous sample value when parking Chris Wilson
` (2 preceding siblings ...)
2017-11-23 6:56 ` [PATCH] " Tvrtko Ursulin
@ 2017-11-23 8:54 ` Chris Wilson
2017-11-23 9:27 ` [PATCH v3] " Tvrtko Ursulin
2017-11-23 10:22 ` ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev3) Patchwork
` (2 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Chris Wilson @ 2017-11-23 8:54 UTC (permalink / raw)
To: intel-gfx
When turning off the engines, and the pmu sampling, clear the previous
value as the current measurement should be 0.
v2: Use a for-loop
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_pmu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 1071935bfa67..a35422c6672b 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -135,6 +135,10 @@ static bool pmu_needs_timer(struct drm_i915_private *i915, bool gpu_active)
void i915_pmu_gt_parked(struct drm_i915_private *i915)
{
+ struct intel_engine_cs *engine;
+ enum intel_engine_id id;
+ int i;
+
if (!i915->pmu.base.event_init)
return;
@@ -145,6 +149,12 @@ void i915_pmu_gt_parked(struct drm_i915_private *i915)
*/
i915->pmu.timer_enabled = pmu_needs_timer(i915, false);
spin_unlock_irq(&i915->pmu.lock);
+
+ /* This is quite rough... We need to coordinate with the timer etc. */
+ for_each_engine(engine, i915, id) {
+ for (i = 0; i < ARRAY_SIZE(engine->pmu.sample); i++)
+ engine->pmu.sample[i].prev = 0;
+ }
}
static void __i915_pmu_maybe_start_timer(struct drm_i915_private *i915)
--
2.15.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 8:54 ` [PATCH v2] " Chris Wilson
@ 2017-11-23 9:27 ` Tvrtko Ursulin
2017-11-23 9:37 ` Chris Wilson
0 siblings, 1 reply; 15+ messages in thread
From: Tvrtko Ursulin @ 2017-11-23 9:27 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
When turning off the engines, and the pmu sampling, clear the previous
value as the current measurement should be 0.
v2: Use a for-loop
v3:
* Move clearing to timer self-dis-arm to avoid race with parking.
* Clear frequency samples as well.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_pmu.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index f1e932a3fb85..1a52a3d0e5a9 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -262,13 +262,31 @@ static void frequency_sample(struct drm_i915_private *dev_priv)
}
}
+static void clear_previous_samples(struct drm_i915_private *i915)
+{
+ struct intel_engine_cs *engine;
+ enum intel_engine_id id;
+ unsigned int i;
+
+ for_each_engine(engine, i915, id) {
+ for (i = 0; i < ARRAY_SIZE(engine->pmu.sample); i++)
+ engine->pmu.sample[i].prev = 0;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(i915->pmu.sample); i++)
+ i915->pmu.sample[i].prev = 0;
+}
+
static enum hrtimer_restart i915_sample(struct hrtimer *hrtimer)
{
struct drm_i915_private *i915 =
container_of(hrtimer, struct drm_i915_private, pmu.timer);
- if (!READ_ONCE(i915->pmu.timer_enabled))
+ if (!READ_ONCE(i915->pmu.timer_enabled)) {
+ clear_previous_samples(i915);
+
return HRTIMER_NORESTART;
+ }
engines_sample(i915);
frequency_sample(i915);
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v3] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 9:27 ` [PATCH v3] " Tvrtko Ursulin
@ 2017-11-23 9:37 ` Chris Wilson
2017-11-23 10:17 ` Sagar Arun Kamble
2017-11-23 10:26 ` [PATCH v4] " Tvrtko Ursulin
0 siblings, 2 replies; 15+ messages in thread
From: Chris Wilson @ 2017-11-23 9:37 UTC (permalink / raw)
To: Tvrtko Ursulin, Intel-gfx
Quoting Tvrtko Ursulin (2017-11-23 09:27:40)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> When turning off the engines, and the pmu sampling, clear the previous
> value as the current measurement should be 0.
>
> v2: Use a for-loop
> v3:
> * Move clearing to timer self-dis-arm to avoid race with parking.
> * Clear frequency samples as well.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
That makes sense (wrt to the sampling),
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
(However, for freq.sample we should be using idle-freq not 0, and init
sample.prev to idle-freq?)
Hmm, actual-freq depends on gt.awake, but we are not including that in
pmu_needs_timer.
@@ -119,7 +119,8 @@ static bool pmu_needs_timer(struct drm_i915_private *i915, bool gpu_active)
* running so clear those bits out.
*/
if (!gpu_active)
- enable &= ~ENGINE_SAMPLE_MASK;
+ enable &= ~(config_enabled_mask(I915_PMU_ACTUAL_FREQUENCY) |
+ ENGINE_SAMPLE_MASK);
I think.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v3] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 9:37 ` Chris Wilson
@ 2017-11-23 10:17 ` Sagar Arun Kamble
2017-11-23 10:26 ` [PATCH v4] " Tvrtko Ursulin
1 sibling, 0 replies; 15+ messages in thread
From: Sagar Arun Kamble @ 2017-11-23 10:17 UTC (permalink / raw)
To: Chris Wilson, Tvrtko Ursulin, Intel-gfx
On 11/23/2017 3:07 PM, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2017-11-23 09:27:40)
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> When turning off the engines, and the pmu sampling, clear the previous
>> value as the current measurement should be 0.
>>
>> v2: Use a for-loop
>> v3:
>> * Move clearing to timer self-dis-arm to avoid race with parking.
>> * Clear frequency samples as well.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
> That makes sense (wrt to the sampling),
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> (However, for freq.sample we should be using idle-freq not 0, and init
> sample.prev to idle-freq?)
>
> Hmm, actual-freq depends on gt.awake, but we are not including that in
> pmu_needs_timer.
frequency_sample is reading cur_freq as SAMPLE_FREQ_ACT if GT is not
awake, else it reads CAGF.
Are we sure CAGF will not fall below Rpn (I seem to have seen on SKL it
go to 300MHz with Rpn=350Mhz),
this made me think that shouldn't we always be reading CAGF?
>
> @@ -119,7 +119,8 @@ static bool pmu_needs_timer(struct drm_i915_private *i915, bool gpu_active)
> * running so clear those bits out.
> */
> if (!gpu_active)
> - enable &= ~ENGINE_SAMPLE_MASK;
> + enable &= ~(config_enabled_mask(I915_PMU_ACTUAL_FREQUENCY) |
> + ENGINE_SAMPLE_MASK);
>
> I think.
> -Chris
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v4] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 9:37 ` Chris Wilson
2017-11-23 10:17 ` Sagar Arun Kamble
@ 2017-11-23 10:26 ` Tvrtko Ursulin
2017-11-23 12:06 ` Chris Wilson
1 sibling, 1 reply; 15+ messages in thread
From: Tvrtko Ursulin @ 2017-11-23 10:26 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
When turning off the engines, and the pmu sampling, clear the previous
value as the current measurement should be 0.
v2: Use a for-loop
v3:
* Move clearing to timer self-dis-arm to avoid race with parking.
* Clear frequency samples as well.
v4:
* Init frequency to idle_freq. (Chris Wilson)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v3)
---
drivers/gpu/drm/i915/i915_pmu.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index f1e932a3fb85..2906d2c7e395 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -262,13 +262,31 @@ static void frequency_sample(struct drm_i915_private *dev_priv)
}
}
+static void pmu_init_previous_samples(struct drm_i915_private *i915)
+{
+ struct intel_engine_cs *engine;
+ enum intel_engine_id id;
+ unsigned int i;
+
+ for_each_engine(engine, i915, id) {
+ for (i = 0; i < ARRAY_SIZE(engine->pmu.sample); i++)
+ engine->pmu.sample[i].prev = 0;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(i915->pmu.sample); i++)
+ i915->pmu.sample[i].prev = i915->gt_pm.rps.idle_freq;
+}
+
static enum hrtimer_restart i915_sample(struct hrtimer *hrtimer)
{
struct drm_i915_private *i915 =
container_of(hrtimer, struct drm_i915_private, pmu.timer);
- if (!READ_ONCE(i915->pmu.timer_enabled))
+ if (!READ_ONCE(i915->pmu.timer_enabled)) {
+ pmu_init_previous_samples(i915);
+
return HRTIMER_NORESTART;
+ }
engines_sample(i915);
frequency_sample(i915);
@@ -834,6 +852,8 @@ void i915_pmu_register(struct drm_i915_private *i915)
hrtimer_init(&i915->pmu.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
i915->pmu.timer.function = i915_sample;
+ pmu_init_previous_samples(i915);
+
for_each_engine(engine, i915, id)
INIT_DELAYED_WORK(&engine->pmu.disable_busy_stats,
__disable_busy_stats);
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v4] drm/i915/pmu: Clear the previous sample value when parking
2017-11-23 10:26 ` [PATCH v4] " Tvrtko Ursulin
@ 2017-11-23 12:06 ` Chris Wilson
0 siblings, 0 replies; 15+ messages in thread
From: Chris Wilson @ 2017-11-23 12:06 UTC (permalink / raw)
To: Tvrtko Ursulin, Intel-gfx
Quoting Tvrtko Ursulin (2017-11-23 10:26:54)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> When turning off the engines, and the pmu sampling, clear the previous
> value as the current measurement should be 0.
>
> v2: Use a for-loop
> v3:
> * Move clearing to timer self-dis-arm to avoid race with parking.
> * Clear frequency samples as well.
> v4:
> * Init frequency to idle_freq. (Chris Wilson)
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v3)
Ok, we know we still have a hole if the timer is running for both
engine and frequency sampling at the time of parking, and we accept that
this is just a step in the right direction to reduce the small
statistical error.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev3)
2017-11-23 0:06 [PATCH] drm/i915/pmu: Clear the previous sample value when parking Chris Wilson
` (3 preceding siblings ...)
2017-11-23 8:54 ` [PATCH v2] " Chris Wilson
@ 2017-11-23 10:22 ` Patchwork
2017-11-23 12:36 ` Tvrtko Ursulin
2017-11-23 11:20 ` ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev4) Patchwork
2017-11-23 14:06 ` ✗ Fi.CI.IGT: warning " Patchwork
6 siblings, 1 reply; 15+ messages in thread
From: Patchwork @ 2017-11-23 10:22 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/pmu: Clear the previous sample value when parking (rev3)
URL : https://patchwork.freedesktop.org/series/34262/
State : success
== Summary ==
Series 34262v3 drm/i915/pmu: Clear the previous sample value when parking
https://patchwork.freedesktop.org/api/1.0/series/34262/revisions/3/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:450s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:461s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:382s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:540s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:277s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:505s
fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:504s
fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:490s
fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:619s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:265s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:542s
fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:436s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:436s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:427s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:491s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:459s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:492s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:530s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:534s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:577s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:457s
fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:544s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:561s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:517s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:497s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:459s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:561s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:422s
Blacklisted hosts:
fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:552s
fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:497s
fi-bxt-j4205 failed to collect. IGT log at Patchwork_7250/fi-bxt-j4205/igt.log
0df0feb7141cc848766a9475b51cc919c010eaa8 drm-tip: 2017y-11m-23d-09h-17m-34s UTC integration manifest
d96a72aad748 drm/i915/pmu: Clear the previous sample value when parking
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7250/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev3)
2017-11-23 10:22 ` ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev3) Patchwork
@ 2017-11-23 12:36 ` Tvrtko Ursulin
0 siblings, 0 replies; 15+ messages in thread
From: Tvrtko Ursulin @ 2017-11-23 12:36 UTC (permalink / raw)
To: intel-gfx, Patchwork, Tvrtko Ursulin
On 23/11/2017 10:22, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915/pmu: Clear the previous sample value when parking (rev3)
> URL : https://patchwork.freedesktop.org/series/34262/
> State : success
>
> == Summary ==
>
> Series 34262v3 drm/i915/pmu: Clear the previous sample value when parking
> https://patchwork.freedesktop.org/api/1.0/series/34262/revisions/3/mbox/
>
> Test kms_pipe_crc_basic:
> Subgroup suspend-read-crc-pipe-b:
> incomplete -> PASS (fi-snb-2520m) fdo#103713
>
> fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
>
> fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:450s
> fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:461s
> fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:382s
> fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:540s
> fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:277s
> fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:505s
> fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:504s
> fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:490s
> fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:619s
> fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s
> fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:265s
> fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:542s
> fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:436s
> fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:436s
> fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:427s
> fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:491s
> fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:459s
> fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:492s
> fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:530s
> fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s
> fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:534s
> fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:577s
> fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:457s
> fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:544s
> fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:561s
> fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:517s
> fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:497s
> fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:459s
> fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:561s
> fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:422s
> Blacklisted hosts:
> fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:552s
> fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:497s
> fi-bxt-j4205 failed to collect. IGT log at Patchwork_7250/fi-bxt-j4205/igt.log
>
> 0df0feb7141cc848766a9475b51cc919c010eaa8 drm-tip: 2017y-11m-23d-09h-17m-34s UTC integration manifest
> d96a72aad748 drm/i915/pmu: Clear the previous sample value when parking
Pushed, thanks for debugging this and all!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev4)
2017-11-23 0:06 [PATCH] drm/i915/pmu: Clear the previous sample value when parking Chris Wilson
` (4 preceding siblings ...)
2017-11-23 10:22 ` ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev3) Patchwork
@ 2017-11-23 11:20 ` Patchwork
2017-11-23 14:06 ` ✗ Fi.CI.IGT: warning " Patchwork
6 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2017-11-23 11:20 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/pmu: Clear the previous sample value when parking (rev4)
URL : https://patchwork.freedesktop.org/series/34262/
State : success
== Summary ==
Series 34262v4 drm/i915/pmu: Clear the previous sample value when parking
https://patchwork.freedesktop.org/api/1.0/series/34262/revisions/4/mbox/
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:443s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:380s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:536s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:280s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:510s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:506s
fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:506s
fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:489s
fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:613s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:435s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:264s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:541s
fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:436s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:438s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:430s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:486s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:479s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:530s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:477s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:532s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:583s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:460s
fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:544s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:567s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:515s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:498s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:459s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:566s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:423s
Blacklisted hosts:
fi-glk-dsi total:289 pass:159 dwarn:0 dfail:10 fail:2 skip:118 time:397s
606231c4d58188daa3a9a02ac6b95f42c4fcf267 drm-tip: 2017y-11m-23d-10h-35m-48s UTC integration manifest
c1d12d039da5 drm/i915/pmu: Clear the previous sample value when parking
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7252/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* ✗ Fi.CI.IGT: warning for drm/i915/pmu: Clear the previous sample value when parking (rev4)
2017-11-23 0:06 [PATCH] drm/i915/pmu: Clear the previous sample value when parking Chris Wilson
` (5 preceding siblings ...)
2017-11-23 11:20 ` ✓ Fi.CI.BAT: success for drm/i915/pmu: Clear the previous sample value when parking (rev4) Patchwork
@ 2017-11-23 14:06 ` Patchwork
6 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2017-11-23 14:06 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/pmu: Clear the previous sample value when parking (rev4)
URL : https://patchwork.freedesktop.org/series/34262/
State : warning
== Summary ==
Test kms_plane_lowres:
Subgroup pipe-b-tiling-none:
pass -> SKIP (shard-hsw) fdo#103181
Test kms_plane_multiple:
Subgroup atomic-pipe-b-tiling-x:
pass -> SKIP (shard-hsw)
Test kms_draw_crc:
Subgroup draw-method-rgb565-mmap-cpu-untiled:
pass -> SKIP (shard-hsw) fdo#103184
Test gem_mmap_wc:
Subgroup set-cache-level:
pass -> SKIP (shard-hsw)
Test kms_plane:
Subgroup plane-position-covered-pipe-a-planes:
pass -> SKIP (shard-hsw)
Test drv_selftest:
Subgroup mock_sanitycheck:
pass -> DMESG-WARN (shard-snb) fdo#103717
dmesg-warn -> PASS (shard-hsw) fdo#103719
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623
fdo#103181 https://bugs.freedesktop.org/show_bug.cgi?id=103181
fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
fdo#103717 https://bugs.freedesktop.org/show_bug.cgi?id=103717
fdo#103719 https://bugs.freedesktop.org/show_bug.cgi?id=103719
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2667 pass:1530 dwarn:1 dfail:0 fail:10 skip:1126 time:9568s
shard-snb total:2667 pass:1312 dwarn:2 dfail:0 fail:12 skip:1341 time:8135s
Blacklisted hosts:
shard-apl total:2667 pass:1687 dwarn:3 dfail:0 fail:23 skip:954 time:13491s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7252/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread