* [PATCH] drm/i915/pmu: Do not report 100% RC6 if not supported
@ 2021-03-30 15:06 Tvrtko Ursulin
2021-04-01 9:25 ` [Intel-gfx] " Rodrigo Vivi
2021-04-06 11:19 ` Andi Shyti
0 siblings, 2 replies; 4+ messages in thread
From: Tvrtko Ursulin @ 2021-03-30 15:06 UTC (permalink / raw)
To: Intel-gfx; +Cc: Eero T Tamminen, dri-devel, Tvrtko Ursulin
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
We use GT parked status to estimate RC6 while not in use, however if RC6
is not supported to start with that does not work very well and produces a
false 100% RC6 readout.
Fix by not advancing the estimated RC6 counter when feature is not
supported.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
Reported-by: Eero T Tamminen <eero.t.tamminen@intel.com>
---
drivers/gpu/drm/i915/i915_pmu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 41651ac255fa..02fe0d22c470 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -191,7 +191,10 @@ static u64 get_rc6(struct intel_gt *gt)
* on top of the last known real value, as the approximated RC6
* counter value.
*/
- val = ktime_since_raw(pmu->sleep_last);
+ if (gt->rc6.supported)
+ val = ktime_since_raw(pmu->sleep_last);
+ else
+ val = 0;
val += pmu->sample[__I915_SAMPLE_RC6].cur;
}
--
2.27.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/pmu: Do not report 100% RC6 if not supported
2021-03-30 15:06 [PATCH] drm/i915/pmu: Do not report 100% RC6 if not supported Tvrtko Ursulin
@ 2021-04-01 9:25 ` Rodrigo Vivi
2021-04-06 11:19 ` Andi Shyti
1 sibling, 0 replies; 4+ messages in thread
From: Rodrigo Vivi @ 2021-04-01 9:25 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel-gfx, Eero T Tamminen, dri-devel
On Tue, Mar 30, 2021 at 04:06:37PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> We use GT parked status to estimate RC6 while not in use, however if RC6
> is not supported to start with that does not work very well and produces a
> false 100% RC6 readout.
oh! I had missed this one...
>
> Fix by not advancing the estimated RC6 counter when feature is not
> supported.
either this or the other proposal, consider both as
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
I prefer this, but I don't have strong opinions on which one.
you (or Eero) pick one...
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
> Reported-by: Eero T Tamminen <eero.t.tamminen@intel.com>
> ---
> drivers/gpu/drm/i915/i915_pmu.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
> index 41651ac255fa..02fe0d22c470 100644
> --- a/drivers/gpu/drm/i915/i915_pmu.c
> +++ b/drivers/gpu/drm/i915/i915_pmu.c
> @@ -191,7 +191,10 @@ static u64 get_rc6(struct intel_gt *gt)
> * on top of the last known real value, as the approximated RC6
> * counter value.
> */
> - val = ktime_since_raw(pmu->sleep_last);
> + if (gt->rc6.supported)
> + val = ktime_since_raw(pmu->sleep_last);
> + else
> + val = 0;
> val += pmu->sample[__I915_SAMPLE_RC6].cur;
> }
>
> --
> 2.27.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/pmu: Do not report 100% RC6 if not supported
2021-03-30 15:06 [PATCH] drm/i915/pmu: Do not report 100% RC6 if not supported Tvrtko Ursulin
2021-04-01 9:25 ` [Intel-gfx] " Rodrigo Vivi
@ 2021-04-06 11:19 ` Andi Shyti
2021-04-09 11:46 ` Tvrtko Ursulin
1 sibling, 1 reply; 4+ messages in thread
From: Andi Shyti @ 2021-04-06 11:19 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel-gfx, Eero T Tamminen, dri-devel
Hi Tvrtko,
> We use GT parked status to estimate RC6 while not in use, however if RC6
> is not supported to start with that does not work very well and produces a
> false 100% RC6 readout.
>
> Fix by not advancing the estimated RC6 counter when feature is not
> supported.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
> Reported-by: Eero T Tamminen <eero.t.tamminen@intel.com>
> ---
> drivers/gpu/drm/i915/i915_pmu.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
> index 41651ac255fa..02fe0d22c470 100644
> --- a/drivers/gpu/drm/i915/i915_pmu.c
> +++ b/drivers/gpu/drm/i915/i915_pmu.c
> @@ -191,7 +191,10 @@ static u64 get_rc6(struct intel_gt *gt)
> * on top of the last known real value, as the approximated RC6
> * counter value.
> */
> - val = ktime_since_raw(pmu->sleep_last);
> + if (gt->rc6.supported)
> + val = ktime_since_raw(pmu->sleep_last);
> + else
> + val = 0;
if rc6 is not supported, why are we here?
Did you mean rc6.enabled ?
Andi
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/pmu: Do not report 100% RC6 if not supported
2021-04-06 11:19 ` Andi Shyti
@ 2021-04-09 11:46 ` Tvrtko Ursulin
0 siblings, 0 replies; 4+ messages in thread
From: Tvrtko Ursulin @ 2021-04-09 11:46 UTC (permalink / raw)
To: Andi Shyti; +Cc: Intel-gfx, Eero T Tamminen, dri-devel
On 06/04/2021 12:19, Andi Shyti wrote:
> Hi Tvrtko,
>
>> We use GT parked status to estimate RC6 while not in use, however if RC6
>> is not supported to start with that does not work very well and produces a
>> false 100% RC6 readout.
>>
>> Fix by not advancing the estimated RC6 counter when feature is not
>> supported.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
>> Reported-by: Eero T Tamminen <eero.t.tamminen@intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_pmu.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
>> index 41651ac255fa..02fe0d22c470 100644
>> --- a/drivers/gpu/drm/i915/i915_pmu.c
>> +++ b/drivers/gpu/drm/i915/i915_pmu.c
>> @@ -191,7 +191,10 @@ static u64 get_rc6(struct intel_gt *gt)
>> * on top of the last known real value, as the approximated RC6
>> * counter value.
>> */
>> - val = ktime_since_raw(pmu->sleep_last);
>> + if (gt->rc6.supported)
>> + val = ktime_since_raw(pmu->sleep_last);
>> + else
>> + val = 0;
>
> if rc6 is not supported, why are we here?
There is another flavour of this patch which indeed prevents us from
getting here if rc6 is not enabled. (By not exposing the counter if not
supported.)
>
> Did you mean rc6.enabled ?
Yeah, I did not see that one initially at all! But it doesn't matter
since this patch is not going in anyway.
Regards,
Tvrtko
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-09 11:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30 15:06 [PATCH] drm/i915/pmu: Do not report 100% RC6 if not supported Tvrtko Ursulin
2021-04-01 9:25 ` [Intel-gfx] " Rodrigo Vivi
2021-04-06 11:19 ` Andi Shyti
2021-04-09 11:46 ` Tvrtko Ursulin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).