* [PATCH] drm/i915: Explicitly track active fw_domain timers
@ 2019-07-07 22:15 Chris Wilson
2019-07-07 22:49 ` ✓ Fi.CI.BAT: success for " Patchwork
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Chris Wilson @ 2019-07-07 22:15 UTC (permalink / raw)
To: intel-gfx
Stop guessing over whether we have an extra wakeref held by the delayed
fw put, and track it explicitly for the sake of debug.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_uncore.c | 13 ++++++-------
drivers/gpu/drm/i915/intel_uncore.h | 1 +
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 5f0367fd3200..768fee3c59aa 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -78,6 +78,8 @@ fw_domain_reset(const struct intel_uncore_forcewake_domain *d)
static inline void
fw_domain_arm_timer(struct intel_uncore_forcewake_domain *d)
{
+ GEM_BUG_ON(d->uncore->fw_domains_timer & d->mask);
+ d->uncore->fw_domains_timer |= d->mask;
d->wake_count++;
hrtimer_start_range_ns(&d->timer,
NSEC_PER_MSEC,
@@ -353,9 +355,8 @@ intel_uncore_fw_release_timer(struct hrtimer *timer)
return HRTIMER_RESTART;
spin_lock_irqsave(&uncore->lock, irqflags);
- if (WARN_ON(domain->wake_count == 0))
- domain->wake_count++;
+ uncore->fw_domains_timer &= ~domain->mask;
if (--domain->wake_count == 0)
uncore->funcs.force_wake_put(uncore, domain->mask);
@@ -673,8 +674,7 @@ static void __intel_uncore_forcewake_put(struct intel_uncore *uncore,
fw_domains &= uncore->fw_domains;
for_each_fw_domain_masked(domain, fw_domains, uncore, tmp) {
- if (WARN_ON(domain->wake_count == 0))
- continue;
+ GEM_BUG_ON(!domain->wake_count);
if (--domain->wake_count) {
domain->active = true;
@@ -764,7 +764,7 @@ void assert_forcewakes_active(struct intel_uncore *uncore,
unsigned int actual = READ_ONCE(domain->wake_count);
unsigned int expect = 1;
- if (hrtimer_active(&domain->timer) && READ_ONCE(domain->active))
+ if (uncore->fw_domains_timer & domain->mask)
expect++; /* pending automatic release */
if (WARN(actual < expect,
@@ -1160,8 +1160,7 @@ static noinline void ___force_wake_auto(struct intel_uncore *uncore,
static inline void __force_wake_auto(struct intel_uncore *uncore,
enum forcewake_domains fw_domains)
{
- if (WARN_ON(!fw_domains))
- return;
+ GEM_BUG_ON(!fw_domains);
/* Turn on all requested but inactive supported forcewake domains. */
fw_domains &= uncore->fw_domains;
diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
index 7108475d9b24..2f6ffa309669 100644
--- a/drivers/gpu/drm/i915/intel_uncore.h
+++ b/drivers/gpu/drm/i915/intel_uncore.h
@@ -123,6 +123,7 @@ struct intel_uncore {
enum forcewake_domains fw_domains;
enum forcewake_domains fw_domains_active;
+ enum forcewake_domains fw_domains_timer;
enum forcewake_domains fw_domains_saved; /* user domains saved for S3 */
struct intel_uncore_forcewake_domain {
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Explicitly track active fw_domain timers
2019-07-07 22:15 [PATCH] drm/i915: Explicitly track active fw_domain timers Chris Wilson
@ 2019-07-07 22:49 ` Patchwork
2019-07-08 4:49 ` ✓ Fi.CI.IGT: " Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-07-07 22:49 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Explicitly track active fw_domain timers
URL : https://patchwork.freedesktop.org/series/63331/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6428 -> Patchwork_13556
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/
Known issues
------------
Here are the changes found in Patchwork_13556 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_create@basic-files:
- fi-icl-u2: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#109100])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/fi-icl-u2/igt@gem_ctx_create@basic-files.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/fi-icl-u2/igt@gem_ctx_create@basic-files.html
#### Possible fixes ####
* igt@i915_selftest@live_hangcheck:
- fi-kbl-8809g: [DMESG-WARN][3] ([fdo#111074]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/fi-kbl-8809g/igt@i915_selftest@live_hangcheck.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/fi-kbl-8809g/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][5] ([fdo#109485]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_frontbuffer_tracking@basic:
- {fi-icl-u4}: [FAIL][7] ([fdo#103167]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/fi-icl-u4/igt@kms_frontbuffer_tracking@basic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/fi-icl-u4/igt@kms_frontbuffer_tracking@basic.html
- fi-hsw-peppy: [DMESG-WARN][9] ([fdo#102614]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#111074]: https://bugs.freedesktop.org/show_bug.cgi?id=111074
Participating hosts (53 -> 45)
------------------------------
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6428 -> Patchwork_13556
CI_DRM_6428: b48155ed6d4d6bdfb48ef317f8da109c11c98110 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5088: 3356087442806675438319578f1c964e51ee4965 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13556: 5d6950b89a60868ab93b95f1f0386a990d048145 @ git://anongit.freedesktop.org/gfx-ci/linux
== Kernel 32bit build ==
Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/build_32bit.log
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 112 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
scripts/Makefile.modpost:91: recipe for target '__modpost' failed
make[1]: *** [__modpost] Error 1
Makefile:1287: recipe for target 'modules' failed
make: *** [modules] Error 2
== Linux commits ==
5d6950b89a60 drm/i915: Explicitly track active fw_domain timers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Explicitly track active fw_domain timers
2019-07-07 22:15 [PATCH] drm/i915: Explicitly track active fw_domain timers Chris Wilson
2019-07-07 22:49 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-07-08 4:49 ` Patchwork
2019-07-08 9:26 ` ✓ Fi.CI.BAT: success for drm/i915: Explicitly track active fw_domain timers (rev2) Patchwork
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-07-08 4:49 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Explicitly track active fw_domain timers
URL : https://patchwork.freedesktop.org/series/63331/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6428_full -> Patchwork_13556_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13556_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_softpin@noreloc-s3:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-apl6/igt@gem_softpin@noreloc-s3.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-apl2/igt@gem_softpin@noreloc-s3.html
- shard-skl: [PASS][3] -> [INCOMPLETE][4] ([fdo#104108])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl2/igt@gem_softpin@noreloc-s3.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl8/igt@gem_softpin@noreloc-s3.html
* igt@kms_cursor_crc@pipe-a-cursor-64x21-random:
- shard-skl: [PASS][5] -> [FAIL][6] ([fdo#103232])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl10/igt@kms_cursor_crc@pipe-a-cursor-64x21-random.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl9/igt@kms_cursor_crc@pipe-a-cursor-64x21-random.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([fdo#108566]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-kbl6/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_cursor_legacy@cursor-vs-flip-legacy:
- shard-hsw: [PASS][9] -> [FAIL][10] ([fdo#103355])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-hsw8/igt@kms_cursor_legacy@cursor-vs-flip-legacy.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-hsw5/igt@kms_cursor_legacy@cursor-vs-flip-legacy.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][11] -> [FAIL][12] ([fdo#105363])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl8/igt@kms_flip@flip-vs-expired-vblank.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl2/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_flip@plain-flip-fb-recreate:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#100368])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl9/igt@kms_flip@plain-flip-fb-recreate.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl7/igt@kms_flip@plain-flip-fb-recreate.html
* igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
- shard-iclb: [PASS][15] -> [FAIL][16] ([fdo#103167]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-skl: [PASS][17] -> [FAIL][18] ([fdo#103167])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl10/igt@kms_frontbuffer_tracking@fbc-suspend.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl9/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#108145]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl10/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145] / [fdo#110403])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl6/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-iclb5/igt@kms_psr@psr2_no_drrs.html
* igt@perf@blocking:
- shard-skl: [PASS][25] -> [FAIL][26] ([fdo#110728]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl10/igt@perf@blocking.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl9/igt@perf@blocking.html
#### Possible fixes ####
* igt@drm_read@short-buffer-wakeup:
- shard-hsw: [INCOMPLETE][27] ([fdo#103540]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-hsw8/igt@drm_read@short-buffer-wakeup.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-hsw5/igt@drm_read@short-buffer-wakeup.html
* igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions-varying-size:
- shard-apl: [INCOMPLETE][29] ([fdo#103927]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-apl6/igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions-varying-size.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-apl7/igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions-varying-size.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [DMESG-WARN][31] ([fdo#108566]) -> [PASS][32] +6 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-apl5/igt@kms_frontbuffer_tracking@fbc-suspend.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-apl5/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [FAIL][33] ([fdo#103167]) -> [PASS][34] +4 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][35] ([fdo#103166]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-x.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_primary_render:
- shard-iclb: [SKIP][37] ([fdo#109441]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-iclb5/igt@kms_psr@psr2_primary_render.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-iclb2/igt@kms_psr@psr2_primary_render.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-skl: [INCOMPLETE][39] ([fdo#104108]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl10/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl9/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
* igt@kms_vblank@pipe-a-wait-forked-busy:
- shard-snb: [SKIP][41] ([fdo#109271]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-snb2/igt@kms_vblank@pipe-a-wait-forked-busy.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-snb1/igt@kms_vblank@pipe-a-wait-forked-busy.html
* igt@tools_test@tools_test:
- shard-apl: [SKIP][43] ([fdo#109271]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-apl4/igt@tools_test@tools_test.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-apl7/igt@tools_test@tools_test.html
- shard-glk: [SKIP][45] ([fdo#109271]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-glk9/igt@tools_test@tools_test.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-glk9/igt@tools_test@tools_test.html
#### Warnings ####
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu:
- shard-skl: [FAIL][47] ([fdo#103167]) -> [FAIL][48] ([fdo#108040])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6428/shard-skl2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/shard-skl2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu.html
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6428 -> Patchwork_13556
CI_DRM_6428: b48155ed6d4d6bdfb48ef317f8da109c11c98110 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5088: 3356087442806675438319578f1c964e51ee4965 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13556: 5d6950b89a60868ab93b95f1f0386a990d048145 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13556/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Explicitly track active fw_domain timers (rev2)
2019-07-07 22:15 [PATCH] drm/i915: Explicitly track active fw_domain timers Chris Wilson
2019-07-07 22:49 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-07-08 4:49 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-07-08 9:26 ` Patchwork
2019-07-08 12:06 ` ✓ Fi.CI.IGT: " Patchwork
2019-07-08 15:40 ` [PATCH] drm/i915: Explicitly track active fw_domain timers Mika Kuoppala
4 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-07-08 9:26 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Explicitly track active fw_domain timers (rev2)
URL : https://patchwork.freedesktop.org/series/63331/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6429 -> Patchwork_13558
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/
Known issues
------------
Here are the changes found in Patchwork_13558 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: [PASS][1] -> [DMESG-WARN][2] ([fdo#106387])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/fi-ilk-650/igt@prime_vgem@basic-fence-flip.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/fi-ilk-650/igt@prime_vgem@basic-fence-flip.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: [INCOMPLETE][3] ([fdo#107718]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live_hangcheck:
- fi-kbl-x1275: [DMESG-WARN][5] ([fdo#111074]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/fi-kbl-x1275/igt@i915_selftest@live_hangcheck.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/fi-kbl-x1275/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][7] ([fdo#109485]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
#### Warnings ####
* igt@gem_exec_parse@basic-allowed:
- fi-cml-u: [SKIP][9] ([fdo#109289] / [fdo#110514]) -> [SKIP][10] ([fdo#109289]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/fi-cml-u/igt@gem_exec_parse@basic-allowed.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/fi-cml-u/igt@gem_exec_parse@basic-allowed.html
* igt@gem_exec_parse@basic-rejected:
- fi-cml-u2: [SKIP][11] ([fdo#109289] / [fdo#110514]) -> [SKIP][12] ([fdo#109289]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/fi-cml-u2/igt@gem_exec_parse@basic-rejected.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/fi-cml-u2/igt@gem_exec_parse@basic-rejected.html
[fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110514]: https://bugs.freedesktop.org/show_bug.cgi?id=110514
[fdo#111074]: https://bugs.freedesktop.org/show_bug.cgi?id=111074
Participating hosts (52 -> 46)
------------------------------
Additional (4): fi-icl-u4 fi-skl-iommu fi-icl-u2 fi-skl-6700k2
Missing (10): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-icl-y fi-icl-dsi fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6429 -> Patchwork_13558
CI_DRM_6429: ec3f2457cb852af756bf9022496370f4a22b0fee @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5089: d2a10fb734c34b72eb17c58d9dae813321112ee6 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13558: 590f6c02cc199469e9b0d2d1f36fbb05ddede9f2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Kernel 32bit build ==
Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/build_32bit.log
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 112 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
scripts/Makefile.modpost:91: recipe for target '__modpost' failed
make[1]: *** [__modpost] Error 1
Makefile:1287: recipe for target 'modules' failed
make: *** [modules] Error 2
== Linux commits ==
590f6c02cc19 drm/i915: Explicitly track active fw_domain timers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Explicitly track active fw_domain timers (rev2)
2019-07-07 22:15 [PATCH] drm/i915: Explicitly track active fw_domain timers Chris Wilson
` (2 preceding siblings ...)
2019-07-08 9:26 ` ✓ Fi.CI.BAT: success for drm/i915: Explicitly track active fw_domain timers (rev2) Patchwork
@ 2019-07-08 12:06 ` Patchwork
2019-07-08 15:40 ` [PATCH] drm/i915: Explicitly track active fw_domain timers Mika Kuoppala
4 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-07-08 12:06 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Explicitly track active fw_domain timers (rev2)
URL : https://patchwork.freedesktop.org/series/63331/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6429_full -> Patchwork_13558_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13558_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_hangcheck:
- shard-iclb: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#108569])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-iclb5/igt@i915_selftest@live_hangcheck.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-iclb3/igt@i915_selftest@live_hangcheck.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-apl3/igt@i915_suspend@fence-restore-tiled2untiled.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-apl4/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][5] -> [FAIL][6] ([fdo#105363])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl6/igt@kms_flip@flip-vs-expired-vblank.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl6/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite:
- shard-iclb: [PASS][7] -> [FAIL][8] ([fdo#103167]) +4 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#108145] / [fdo#110403])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl10/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_cursor@pipe-b-overlay-size-256:
- shard-hsw: [PASS][11] -> [INCOMPLETE][12] ([fdo#103540])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-hsw8/igt@kms_plane_cursor@pipe-b-overlay-size-256.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-hsw5/igt@kms_plane_cursor@pipe-b-overlay-size-256.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103166])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-x.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109441])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html
#### Possible fixes ####
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-glk: [INCOMPLETE][17] ([fdo#103359] / [k.org#198133]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-glk2/igt@kms_flip@flip-vs-suspend-interruptible.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-glk9/igt@kms_flip@flip-vs-suspend-interruptible.html
- shard-apl: [DMESG-WARN][19] ([fdo#108566]) -> [PASS][20] +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_flip_tiling@flip-changes-tiling-yf:
- shard-skl: [FAIL][21] ([fdo#108228] / [fdo#108303]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl2/igt@kms_flip_tiling@flip-changes-tiling-yf.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl10/igt@kms_flip_tiling@flip-changes-tiling-yf.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [FAIL][23] ([fdo#103167]) -> [PASS][24] +4 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-skl: [INCOMPLETE][25] ([fdo#104108] / [fdo#106978]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl7/igt@kms_frontbuffer_tracking@psr-suspend.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl2/igt@kms_frontbuffer_tracking@psr-suspend.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
- shard-skl: [FAIL][27] ([fdo#103191]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl4/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl4/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][29] ([fdo#108145]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_cursor_mmap_gtt:
- shard-iclb: [SKIP][31] ([fdo#109441]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-iclb1/igt@kms_psr@psr2_cursor_mmap_gtt.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_gtt.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][33] ([fdo#99912]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-kbl4/igt@kms_setmode@basic.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-kbl6/igt@kms_setmode@basic.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][35] ([fdo#104108]) -> [PASS][36] +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl3/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl8/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
* igt@perf@polling:
- shard-skl: [FAIL][37] ([fdo#110728]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-skl1/igt@perf@polling.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-skl7/igt@perf@polling.html
#### Warnings ####
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][39] ([fdo#107724]) -> [SKIP][40] ([fdo#109349])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6429/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/shard-iclb3/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108228]: https://bugs.freedesktop.org/show_bug.cgi?id=108228
[fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6429 -> Patchwork_13558
CI_DRM_6429: ec3f2457cb852af756bf9022496370f4a22b0fee @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5089: d2a10fb734c34b72eb17c58d9dae813321112ee6 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13558: 590f6c02cc199469e9b0d2d1f36fbb05ddede9f2 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13558/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: Explicitly track active fw_domain timers
2019-07-07 22:15 [PATCH] drm/i915: Explicitly track active fw_domain timers Chris Wilson
` (3 preceding siblings ...)
2019-07-08 12:06 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-07-08 15:40 ` Mika Kuoppala
2019-07-08 15:44 ` Chris Wilson
4 siblings, 1 reply; 7+ messages in thread
From: Mika Kuoppala @ 2019-07-08 15:40 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Stop guessing over whether we have an extra wakeref held by the delayed
> fw put, and track it explicitly for the sake of debug.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/intel_uncore.c | 13 ++++++-------
> drivers/gpu/drm/i915/intel_uncore.h | 1 +
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 5f0367fd3200..768fee3c59aa 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -78,6 +78,8 @@ fw_domain_reset(const struct intel_uncore_forcewake_domain *d)
> static inline void
> fw_domain_arm_timer(struct intel_uncore_forcewake_domain *d)
> {
> + GEM_BUG_ON(d->uncore->fw_domains_timer & d->mask);
> + d->uncore->fw_domains_timer |= d->mask;
> d->wake_count++;
> hrtimer_start_range_ns(&d->timer,
> NSEC_PER_MSEC,
> @@ -353,9 +355,8 @@ intel_uncore_fw_release_timer(struct hrtimer *timer)
> return HRTIMER_RESTART;
>
> spin_lock_irqsave(&uncore->lock, irqflags);
> - if (WARN_ON(domain->wake_count == 0))
> - domain->wake_count++;
>
> + uncore->fw_domains_timer &= ~domain->mask;
> if (--domain->wake_count == 0)
> uncore->funcs.force_wake_put(uncore, domain->mask);
>
> @@ -673,8 +674,7 @@ static void __intel_uncore_forcewake_put(struct intel_uncore *uncore,
> fw_domains &= uncore->fw_domains;
>
> for_each_fw_domain_masked(domain, fw_domains, uncore, tmp) {
> - if (WARN_ON(domain->wake_count == 0))
> - continue;
> + GEM_BUG_ON(!domain->wake_count);
First impression was harsh. But on second thought, if we can't get
our counts right, then what hope is there. None.
>
> if (--domain->wake_count) {
> domain->active = true;
> @@ -764,7 +764,7 @@ void assert_forcewakes_active(struct intel_uncore *uncore,
> unsigned int actual = READ_ONCE(domain->wake_count);
> unsigned int expect = 1;
>
> - if (hrtimer_active(&domain->timer) && READ_ONCE(domain->active))
> + if (uncore->fw_domains_timer & domain->mask)
> expect++; /* pending automatic release */
assetion of timer active on release path seems also superfluous
as the count is our guard.
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>
> if (WARN(actual < expect,
> @@ -1160,8 +1160,7 @@ static noinline void ___force_wake_auto(struct intel_uncore *uncore,
> static inline void __force_wake_auto(struct intel_uncore *uncore,
> enum forcewake_domains fw_domains)
> {
> - if (WARN_ON(!fw_domains))
> - return;
> + GEM_BUG_ON(!fw_domains);
>
> /* Turn on all requested but inactive supported forcewake domains. */
> fw_domains &= uncore->fw_domains;
> diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
> index 7108475d9b24..2f6ffa309669 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.h
> +++ b/drivers/gpu/drm/i915/intel_uncore.h
> @@ -123,6 +123,7 @@ struct intel_uncore {
>
> enum forcewake_domains fw_domains;
> enum forcewake_domains fw_domains_active;
> + enum forcewake_domains fw_domains_timer;
> enum forcewake_domains fw_domains_saved; /* user domains saved for S3 */
>
> struct intel_uncore_forcewake_domain {
> --
> 2.20.1
>
> _______________________________________________
> 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] 7+ messages in thread
* Re: [PATCH] drm/i915: Explicitly track active fw_domain timers
2019-07-08 15:40 ` [PATCH] drm/i915: Explicitly track active fw_domain timers Mika Kuoppala
@ 2019-07-08 15:44 ` Chris Wilson
0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2019-07-08 15:44 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx
Quoting Mika Kuoppala (2019-07-08 16:40:30)
> Chris Wilson <chris@chris-wilson.co.uk> writes:
>
> > Stop guessing over whether we have an extra wakeref held by the delayed
> > fw put, and track it explicitly for the sake of debug.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_uncore.c | 13 ++++++-------
> > drivers/gpu/drm/i915/intel_uncore.h | 1 +
> > 2 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> > index 5f0367fd3200..768fee3c59aa 100644
> > --- a/drivers/gpu/drm/i915/intel_uncore.c
> > +++ b/drivers/gpu/drm/i915/intel_uncore.c
> > @@ -78,6 +78,8 @@ fw_domain_reset(const struct intel_uncore_forcewake_domain *d)
> > static inline void
> > fw_domain_arm_timer(struct intel_uncore_forcewake_domain *d)
> > {
> > + GEM_BUG_ON(d->uncore->fw_domains_timer & d->mask);
> > + d->uncore->fw_domains_timer |= d->mask;
> > d->wake_count++;
> > hrtimer_start_range_ns(&d->timer,
> > NSEC_PER_MSEC,
> > @@ -353,9 +355,8 @@ intel_uncore_fw_release_timer(struct hrtimer *timer)
> > return HRTIMER_RESTART;
> >
> > spin_lock_irqsave(&uncore->lock, irqflags);
> > - if (WARN_ON(domain->wake_count == 0))
> > - domain->wake_count++;
> >
> > + uncore->fw_domains_timer &= ~domain->mask;
> > if (--domain->wake_count == 0)
> > uncore->funcs.force_wake_put(uncore, domain->mask);
> >
> > @@ -673,8 +674,7 @@ static void __intel_uncore_forcewake_put(struct intel_uncore *uncore,
> > fw_domains &= uncore->fw_domains;
> >
> > for_each_fw_domain_masked(domain, fw_domains, uncore, tmp) {
> > - if (WARN_ON(domain->wake_count == 0))
> > - continue;
> > + GEM_BUG_ON(!domain->wake_count);
>
> First impression was harsh. But on second thought, if we can't get
> our counts right, then what hope is there. None.
And we've had the warning there for yonks without a hit, so indeed I
feel justified in making any regression harsh.
> > if (--domain->wake_count) {
> > domain->active = true;
> > @@ -764,7 +764,7 @@ void assert_forcewakes_active(struct intel_uncore *uncore,
> > unsigned int actual = READ_ONCE(domain->wake_count);
> > unsigned int expect = 1;
> >
> > - if (hrtimer_active(&domain->timer) && READ_ONCE(domain->active))
> > + if (uncore->fw_domains_timer & domain->mask)
> > expect++; /* pending automatic release */
>
> assetion of timer active on release path seems also superfluous
> as the count is our guard.
>
>
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
And hopefully this is last fix required to this simple loop. I should
never have listened to Tvrtko... Who needs helpful debug anyway? :)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-07-08 15:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-07 22:15 [PATCH] drm/i915: Explicitly track active fw_domain timers Chris Wilson
2019-07-07 22:49 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-07-08 4:49 ` ✓ Fi.CI.IGT: " Patchwork
2019-07-08 9:26 ` ✓ Fi.CI.BAT: success for drm/i915: Explicitly track active fw_domain timers (rev2) Patchwork
2019-07-08 12:06 ` ✓ Fi.CI.IGT: " Patchwork
2019-07-08 15:40 ` [PATCH] drm/i915: Explicitly track active fw_domain timers Mika Kuoppala
2019-07-08 15:44 ` Chris Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.