drm/i915: Consolidate forcewake status display
Subsystems (2)
PATCH 1/1 drm/i915: Consolidate forcewake status display
From: Tvrtko Ursulin <[email protected]>
Use new common helper intel_gt_show_forcewake from both old and new debugfs code.
--- drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 7 +++++-- drivers/gpu/drm/i915/gt/intel_gt.h | 2 ++ drivers/gpu/drm/i915/i915_debugfs.c | 13 ++----------- 3 files changed, 9 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/gt/debugfs_gt_pm.c +5 -2
@@ -17,9 +17,8 @@#include "intel_sideband.h" #include "intel_uncore.h" -static int fw_domains_show (struct seq_file *m,void *data) +void intel_gt_show_forcewake (struct intel_gt *gt,struct seq_file *m) { -struct intel_gt *gt = m->private;struct intel_uncore *uncore = gt->uncore;struct intel_uncore_forcewake_domain *fw_domain;unsigned int tmp;
@@ -31,7 +30,11 @@ static int fw_domains_show(struct seq_file *m, void *data)seq_printf (m,"%s.wake_count = %u\n" ,intel_uncore_forcewake_domain_to_str (fw_domain->id),READ_ONCE (fw_domain->wake_count)); +} +static int fw_domains_show (struct seq_file *m,void *data) +{ +intel_gt_show_forcewake (m->private, m);return 0 ; }DEFINE_GT_DEBUGFS_ATTRIBUTE (fw_domains);
drivers/gpu/drm/i915/gt/intel_gt.h +2 -0
@@ -68,4 +68,6 @@ static inline bool intel_gt_has_init_error(const struct intel_gt *gt) return test_bit(I915_WEDGED_ON_INIT, >->reset.flags); } +void intel_gt_show_forcewake (struct intel_gt *gt,struct seq_file *m); +#endif /* __INTEL_GT_H__ */
drivers/gpu/drm/i915/i915_debugfs.c +2 -11
@@ -32,6 +32,7 @@#include <drm/drm_debugfs.h> #include "gem/i915_gem_context.h" +#include "gt/intel_gt.h" #include "gt/intel_gt_pm.h" #include "gt/intel_gt_requests.h" #include "gt/intel_reset.h"
@@ -1057,18 +1058,8 @@ static int ilk_drpc_info(struct seq_file *m)static int i915_forcewake_domains (struct seq_file *m,void *data) {struct drm_i915_private *i915 =node_to_i915 (m->private); -struct intel_uncore *uncore = &i915->uncore; -struct intel_uncore_forcewake_domain *fw_domain; -unsigned int tmp; - -seq_printf (m,"user.bypass_count = %u\n" , - uncore->user_forcewake_count); - -for_each_fw_domain (fw_domain, uncore, tmp) -seq_printf (m,"%s.wake_count = %u\n" , -intel_uncore_forcewake_domain_to_str (fw_domain->id), -READ_ONCE (fw_domain->wake_count)); +intel_gt_show_forcewake (&i915->gt, m);return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Tvrtko Ursulin (2020-03-10 14:29:58)
Quoted 7 lines
From: Tvrtko Ursulin <[email protected]>
Use new common helper
intel_gt_show_forcewakefrom both old and new debugfs code.Signed-off-by Tvrtko Ursulin <[email protected]>Cc Andi Shyti <[email protected]>
Fair enough,
Though the question is why didn't we kill off the toplevel fw_domains? -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Chris Wilson
Quoting Tvrtko Ursulin (2020-03-10 14:29:58)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
Use new common helper
intel_gt_show_forcewakefrom both old and new debugfs code.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Andi Shyti <[email protected]>Fair enough,
Reviewed-by Chris Wilson <[email protected]>Though the question is why didn't we kill off the toplevel
fw_domains?
Yeah, I was asking myself the same. Looks like there is no users in IGT so we could just as well. Second patch to follow..
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Consolidate forcewake status display
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Consolidate forcewake status display
URL : https://patchwork.freedesktop.org/series/74522/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8112 -> Patchwork_16907
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16907 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_16907, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16907:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@execlists:
- fi-icl-guc: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8112/fi-icl-guc/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/fi-icl-guc/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_16907 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@execlists:
- fi-bxt-dsi: [PASS][3] -> [INCOMPLETE][4] ([fdo#103927])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8112/fi-bxt-dsi/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/fi-bxt-dsi/igt@i915_selftest@[email protected]
* igt@kms_chamelium@dp-edid-read:
- fi-icl-u2: [PASS][5] -> [FAIL][6] ([fdo#109635] / [i915#217])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8112/fi-icl-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/fi-icl-u2/igt@[email protected]
* igt@prime_busy@basic-wait-before-default:
- fi-tgl-y: [PASS][7] -> [DMESG-WARN][8] ([CI#94] / [i915#402]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8112/fi-tgl-y/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@kms_addfb_basic@unused-modifier:
- fi-tgl-y: [DMESG-WARN][9] ([CI#94] / [i915#402]) -> [PASS][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8112/fi-tgl-y/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][11] ([fdo#111407]) -> [FAIL][12] ([fdo#111096] / [i915#323])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8112/fi-kbl-7500u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/fi-kbl-7500u/igt@[email protected]
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#109635]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (44 -> 43)
------------------------------
Additional (4): fi-skl-6770hq fi-bsw-nick fi-skl-6600u fi-bsw-n3050
Missing (5): fi-hsw-4200u fi-byt-squawks fi-kbl-7560u fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8112 -> Patchwork_16907
CI-20190529: 20190529
CI_DRM_8112: 032f2fe5c92eb1db6d417738431153c001a41bcc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5504: d6788bf0404f76b66170e18eb26c85004b5ccb25 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16907: 4d356536f2ea70d2da480b76c9043bc65b190000 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4d356536f2ea drm/i915: Consolidate forcewake status display
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16907/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Tvrtko,
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Use new common helper
intel_gt_show_forcewakefrom both old and new debugfs code.Signed-off-by Tvrtko Ursulin <[email protected]>Cc Andi Shyti <[email protected]>
Thanks,
Andi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx