drm/i915/vlv: fix RC6 residency time calculation
Subsystems (2)
PATCH 1/1 drm/i915/vlv: fix RC6 residency time calculation
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by pm_rc6_residency.
Testcase: igt/pm_rc6_residency
--- drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_sysfs.c +2 -0
@@ -76,6 +76,8 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg)/* chv counts are one less */ czcount_30ns +=1 ; } + }else { + czcount_30ns +=1 ; }if (units ==0 )
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV.
On CHV this was an special case for 320MHz, on VLV we have only one freq possible or it is global?
The spec I have here doesn't show different freqs here on VLV as we have on CHV.
Quoted 1 line
This matches both the spec and
Anyway, even on CHV I couldn't find where spec mentions this. Could you please point me or share your spec in pvt so I can give a rv-b here.
Quoted 28 lines
the accuracy test by
pm_rc6_residency.Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/i915_sysfs.c +2
-1@@ -76,6 +76,8 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg)/* chv counts are one less */ czcount_30ns +=1 ; } + }else { + czcount_30ns +=1 ; }if (units ==0 ) --2.1.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Rodrigo Vivi
Quoted 2 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV.
On CHV this was an special case for 320MHz, on VLV we have only one freq possible or it is global?
The spec I have here doesn't show different freqs here on VLV as we have on CHV.
The CZ clock rate on VLV can be any of 200, 266 and 300 MHz. In all these cases we need to have the +1 adjustment.
Quoted 5 lines
Quoted 1 line
This matches both the spec and
Anyway, even on CHV I couldn't find where spec mentions this. Could you please point me or share your spec in pvt so I can give a rv-b here.
Ok, sent it to you.
Quoted 20 lines
Quoted 20 lines
the accuracy test by
pm_rc6_residency.Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/i915_sysfs.c +2
-0@@ -76,6 +76,8 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg)/* chv counts are one less */ czcount_30ns +=1 ; } + }else { + czcount_30ns +=1 ; }
Quoted 11 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_sysfs.c +0
-1if (units ==0 ) --2.1.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6429 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 234/234 234/234 ILK 262/262 262/262 SNB -1 282/282 281/282 IVB 300/300 300/300 BYT 254/254 254/254 BDW 275/275 275/275
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
SNB igt@pm_rpm@dpms-mode-unset-non-lpsp DMESG_WARN(7)PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by
pm_rc6_residency.Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76877
Rodrigo, could you review this?
Thanks,
Imre
Quoted 9 lines
--- drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/i915_sysfs.c +0
-0
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 83
Quoted 8 lines
drivers/gpu/drm/i915/i915_sysfs.c +2
-0@@ -76,6 +76,8 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg)/* chv counts are one less */ czcount_30ns +=1 ; } + }else { + czcount_30ns +=1 ; }if (units ==0 )
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
Reviewed-byQuoted 19 lines · Imre Deak
Quoted 6 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by
pm_rc6_residency.Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76877
Rodrigo, could you review this?
Thanks,
ImreQuoted 4 lines
--- drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)
Quoted 10 lines
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 80
Quoted 10 lines
drivers/gpu/drm/i915/i915_sysfs.c +2
-0@@ -76,6 +76,8 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg)/* chv counts are one less */ czcount_30ns +=1 ; } + }else { + czcount_30ns +=1 ;
Thanks for spec and explanation...
Reading code again I believe czcount_30ns += 1; shouldn't be duplicated in middle of elses here.
It would be better to do something like:
units = 0;
div = 1000000ULL;
if (IS_CHERRYVIEW(dev) && czcount_30ns == 1) {
/* Special case for 320Mhz on CHV */
div = 10000000ULL;
units = 3125ULL;
}/* counts are one less */czcount_30ns += 1;
Quoted 7 lines
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 83
Quoted 1 line
drivers/gpu/drm/i915/i915_sysfs.c +0
-0if (units ==0 )_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
But with my bikeshed or not let's move fwd because I hold this for to long already:
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 39 lines · Rodrigo Vivi
Quoted 19 lines · Imre Deak
Quoted 6 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by
pm_rc6_residency.Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76877
Rodrigo, could you review this?
Thanks,
ImreQuoted 4 lines
--- drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)Quoted 10 lines
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 80
Quoted 10 lines
drivers/gpu/drm/i915/i915_sysfs.c +2
-0@@ -76,6 +76,8 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg)/* chv counts are one less */ czcount_30ns +=1 ; } + }else { + czcount_30ns +=1 ;Thanks for spec and explanation...
Reading code again I believeczcount_30ns+= 1; shouldn't be duplicated in middle of elses here.It would be better to do something like:
units = 0;
div = 1000000ULL;
Quoted 8 lines
if (IS_CHERRYVIEW(dev) && czcount_30ns == 1) { /* Special case for 320Mhz on CHV */ div = 10000000ULL; units = 3125ULL; }/* counts are one less */
czcount_30ns+= 1;
This would increment also for the special case, but I agree we should simplify this. I'll follow up with v2.
Quoted 10 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 83
Quoted 2 lines
drivers/gpu/drm/i915/i915_sysfs.c +0
-0if (units ==0 )_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines
But with my bikeshed or not let's move fwd because I hold this for to long already:
Reviewed-by Rodrigo Vivi <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/vlv: fix RC6 residency time calculation
In reply to Imre DeakThe divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by pm_rc6_residency.
v2:
- simplify logic checking for the CHV 320MHz special case (Rodrigo)
Testcase: igt/pm_rc6_residency
--- drivers/gpu/drm/i915/i915_sysfs.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_sysfs.c +7 -15
@@ -64,24 +64,16 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg) goto out; } - units =0 ; - div =1000000ULL ; - -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev) && czcount_30ns ==1 ) {/* Special case for 320Mhz */ -if (czcount_30ns ==1 ) { - div =10000000ULL ; - units =3125ULL ; - }else { -/* chv counts are one less */ - czcount_30ns +=1 ; - } + div =10000000ULL ; + units =3125ULL ; + }else { + czcount_30ns +=1 ; + div =1000000ULL ; + units =DIV_ROUND_UP_ULL (30ULL * bias, czcount_30ns); } -if (units ==0 ) - units =DIV_ROUND_UP_ULL (30ULL * bias, - (u64 )czcount_30ns); -if (I915_READ (VLV_COUNTER_CONTROL ) &VLV_COUNT_RANGE_HIGH ) units <<=8 ;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 30 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by
pm_rc6_residency.v2:
- simplify logic checking for the CHV 320MHz special case (Rodrigo)Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_sysfs.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_sysfs.c +1
-7@@ -64,24 +64,16 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg) goto out; } - units =0 ; - div =1000000ULL ; - -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev) && czcount_30ns ==1 ) {/* Special case for 320Mhz */ -if (czcount_30ns ==1 ) { - div =10000000ULL ; - units =3125ULL ;
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 74
Quoted 10 lines
drivers/gpu/drm/i915/i915_sysfs.c +6
-4- }else { -/* chv counts are one less */ - czcount_30ns +=1 ; - } + div =10000000ULL ; + units =3125ULL ; + }else { + czcount_30ns +=1 ; + div =1000000ULL ; + units =DIV_ROUND_UP_ULL (30ULL * bias, czcount_30ns);
Is (u64) cast unnecessary?
But reading like this now I wonder if we couldn't just pass czcount_30ns+1 instead of the increment...
But if we don't need the cast let's please just ignore this bikeshed and let's move fwd! ;)
More organized than I had suggested, thanks.
Quoted 12 lines
drivers/gpu/drm/i915/i915_sysfs.c +0
-5} -if (units ==0 ) - units =DIV_ROUND_UP_ULL (30ULL * bias, - (u64 )czcount_30ns); -if (I915_READ (VLV_COUNTER_CONTROL ) &VLV_COUNT_RANGE_HIGH ) units <<=8 ; --2.1.4
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 34 lines · Rodrigo Vivi
Quoted 33 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by
pm_rc6_residency.v2:
- simplify logic checking for the CHV 320MHz special case (Rodrigo)Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_sysfs.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_sysfs.c +1
-10@@ -64,24 +64,16 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg) goto out; } - units =0 ; - div =1000000ULL ; - -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev) && czcount_30ns ==1 ) {/* Special case for 320Mhz */ -if (czcount_30ns ==1 ) { - div =10000000ULL ; - units =3125ULL ; - }else { -/* chv counts are one less */ - czcount_30ns +=1 ;
Quoted 8 lines
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 74
Quoted 7 lines
drivers/gpu/drm/i915/i915_sysfs.c +6
-1- } + div =10000000ULL ; + units =3125ULL ; + }else { + czcount_30ns +=1 ; + div =1000000ULL ; + units =DIV_ROUND_UP_ULL (30ULL * bias, czcount_30ns);Is (u64) cast unnecessary?
Yes. Here the only reason for it would be overflow, but that's not possible.
Quoted 4 lines
But reading like this now I wonder if we couldn't just pass czcount_30ns+1 instead of the increment...
But if we don't need the cast let's please just ignore this bikeshed and let's move fwd! ;)
Yes, I think we could do more cleanup in this function as a follow-up. For example we may still loose precision in the current way, would be better to calculate the result directly from the reference clock rate (CZ clock in case of VLV/CHV).
Quoted 3 lines
More organized than I had suggested, thanks.
Reviewed-by Rodrigo Vivi <[email protected]>
Thanks.
Forgot to add:
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76877
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/i915_sysfs.c +0
-4} -if (units ==0 ) - units =DIV_ROUND_UP_ULL (30ULL * bias, - (u64 )czcount_30ns); -if (I915_READ (VLV_COUNTER_CONTROL ) &VLV_COUNT_RANGE_HIGH ) units <<=8 ;
Quoted 6 lines
Quoted 3 lines
--
2.1.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 57 lines · Imre Deak
Quoted 34 lines · Rodrigo Vivi
Quoted 33 lines · Imre Deak
The divider value to convert from CZ clock rate to ms needs a +1 adjustment on VLV just like on CHV. This matches both the spec and the accuracy test by
pm_rc6_residency.v2:
- simplify logic checking for the CHV 320MHz special case (Rodrigo)Testcase: igt/pm_rc6_residency
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_sysfs.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_sysfs.c +1
-10@@ -64,24 +64,16 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg) goto out; } - units =0 ; - div =1000000ULL ; - -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev) && czcount_30ns ==1 ) {/* Special case for 320Mhz */ -if (czcount_30ns ==1 ) { - div =10000000ULL ; - units =3125ULL ; - }else { -/* chv counts are one less */ - czcount_30ns +=1 ;Quoted 8 lines
drivers/gpu/drm/i915/i915_sysfs.c static u32 calc_residency(struct drm_device *dev, const u32 reg) · line 74
Quoted 7 lines
drivers/gpu/drm/i915/i915_sysfs.c +6
-1- } + div =10000000ULL ; + units =3125ULL ; + }else { + czcount_30ns +=1 ; + div =1000000ULL ; + units =DIV_ROUND_UP_ULL (30ULL * bias, czcount_30ns);Is (u64) cast unnecessary?
Yes. Here the only reason for it would be overflow, but that's not possible.
Quoted 4 lines
But reading like this now I wonder if we couldn't just pass czcount_30ns+1 instead of the increment...
But if we don't need the cast let's please just ignore this bikeshed and let's move fwd! ;)Yes, I think we could do more cleanup in this function as a follow-up. For example we may still loose precision in the current way, would be better to calculate the result directly from the reference clock rate (CZ clock in case of VLV/CHV).
Quoted 8 lines
Quoted 3 lines
More organized than I had suggested, thanks.
Reviewed-by Rodrigo Vivi <[email protected]>Thanks.
Forgot to add:
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76877
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6512 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 303/303 303/303 SNB -1 315/315 314/315 IVB 343/343 343/343 BYT 287/287 287/287
BDW -1 321/321 320/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*SNB igt@pm_rpm@dpms-mode-unset-non-lpsp PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
*BDW igt@gem_flink@bad-flink PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_display.c:#assert_plane[i915]()@WARNING:.* at .* assert_plane assertion_failure@assertion failure
WARNING:at_drivers/gpu/drm/drm_irq.c:#drm_wait_one_vblank[drm]()@WARNING:.* at .* drm_wait_one_vblank+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx