* [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output
@ 2018-10-31 20:02 Imre Deak
2018-10-31 20:08 ` Rodrigo Vivi
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Imre Deak @ 2018-10-31 20:02 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
On GEN9 LP (BXT/GLK) DC6 is not supported, so don't print the counter
on those platforms. So far we did this on GLK too.
Testcase: igt/pm_dc/dc6-dpms
Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 041319d48ca3..e11714aa1ca9 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2916,15 +2916,15 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
CSR_VERSION_MINOR(csr->version));
- if (IS_BROXTON(dev_priv)) {
- seq_printf(m, "DC3 -> DC5 count: %d\n",
- I915_READ(BXT_CSR_DC3_DC5_COUNT));
- } else if (IS_GEN(dev_priv, 9, 11)) {
- seq_printf(m, "DC3 -> DC5 count: %d\n",
- I915_READ(SKL_CSR_DC3_DC5_COUNT));
+ if (INTEL_GEN(dev_priv) > 11)
+ goto out;
+
+ seq_printf(m, "DC3 -> DC5 count: %d\n",
+ I915_READ(IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT :
+ SKL_CSR_DC3_DC5_COUNT));
+ if (!IS_GEN9_LP(dev_priv))
seq_printf(m, "DC5 -> DC6 count: %d\n",
I915_READ(SKL_CSR_DC5_DC6_COUNT));
- }
out:
seq_printf(m, "program base: 0x%08x\n", I915_READ(CSR_PROGRAM(0)));
--
2.13.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output
2018-10-31 20:02 [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output Imre Deak
@ 2018-10-31 20:08 ` Rodrigo Vivi
2018-10-31 20:19 ` Imre Deak
2018-10-31 20:45 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-11-01 5:33 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 8+ messages in thread
From: Rodrigo Vivi @ 2018-10-31 20:08 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
On Wed, Oct 31, 2018 at 10:02:20PM +0200, Imre Deak wrote:
> On GEN9 LP (BXT/GLK) DC6 is not supported, so don't print the counter
> on those platforms. So far we did this on GLK too.
>
> Testcase: igt/pm_dc/dc6-dpms
> Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 041319d48ca3..e11714aa1ca9 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2916,15 +2916,15 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
> seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
> CSR_VERSION_MINOR(csr->version));
>
> - if (IS_BROXTON(dev_priv)) {
> - seq_printf(m, "DC3 -> DC5 count: %d\n",
> - I915_READ(BXT_CSR_DC3_DC5_COUNT));
> - } else if (IS_GEN(dev_priv, 9, 11)) {
> - seq_printf(m, "DC3 -> DC5 count: %d\n",
> - I915_READ(SKL_CSR_DC3_DC5_COUNT));
> + if (INTEL_GEN(dev_priv) > 11)
> + goto out;
> +
> + seq_printf(m, "DC3 -> DC5 count: %d\n",
> + I915_READ(IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT :
> + SKL_CSR_DC3_DC5_COUNT));
> + if (!IS_GEN9_LP(dev_priv))
> seq_printf(m, "DC5 -> DC6 count: %d\n",
> I915_READ(SKL_CSR_DC5_DC6_COUNT));
> - }
What about a simple:
- } else if (IS_GEN(dev_priv, 9, 11)) {
- } else if (IS_GEN(dev_priv, 9, 10) && !IS_GEMINILAKE(dev_priv)) {
>
> out:
> seq_printf(m, "program base: 0x%08x\n", I915_READ(CSR_PROGRAM(0)));
> --
> 2.13.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output
2018-10-31 20:08 ` Rodrigo Vivi
@ 2018-10-31 20:19 ` Imre Deak
2018-11-01 18:34 ` Rodrigo Vivi
0 siblings, 1 reply; 8+ messages in thread
From: Imre Deak @ 2018-10-31 20:19 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, Oct 31, 2018 at 01:08:06PM -0700, Rodrigo Vivi wrote:
> On Wed, Oct 31, 2018 at 10:02:20PM +0200, Imre Deak wrote:
> > On GEN9 LP (BXT/GLK) DC6 is not supported, so don't print the counter
> > on those platforms. So far we did this on GLK too.
> >
> > Testcase: igt/pm_dc/dc6-dpms
> > Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
> > 1 file changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index 041319d48ca3..e11714aa1ca9 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -2916,15 +2916,15 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
> > seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
> > CSR_VERSION_MINOR(csr->version));
> >
> > - if (IS_BROXTON(dev_priv)) {
> > - seq_printf(m, "DC3 -> DC5 count: %d\n",
> > - I915_READ(BXT_CSR_DC3_DC5_COUNT));
> > - } else if (IS_GEN(dev_priv, 9, 11)) {
> > - seq_printf(m, "DC3 -> DC5 count: %d\n",
> > - I915_READ(SKL_CSR_DC3_DC5_COUNT));
> > + if (INTEL_GEN(dev_priv) > 11)
> > + goto out;
> > +
> > + seq_printf(m, "DC3 -> DC5 count: %d\n",
> > + I915_READ(IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT :
> > + SKL_CSR_DC3_DC5_COUNT));
> > + if (!IS_GEN9_LP(dev_priv))
> > seq_printf(m, "DC5 -> DC6 count: %d\n",
> > I915_READ(SKL_CSR_DC5_DC6_COUNT));
> > - }
>
> What about a simple:
>
> - } else if (IS_GEN(dev_priv, 9, 11)) {
> - } else if (IS_GEN(dev_priv, 9, 10) && !IS_GEMINILAKE(dev_priv)) {
You mean
- } else if (IS_GEN(dev_priv, 9, 11)) {
+ } else if (IS_GEN(dev_priv, 9, 11) && !IS_GEMINILAKE(dev_priv)) {
?
That wouldn't print even the DC5 counter on GLK.
>
> >
> > out:
> > seq_printf(m, "program base: 0x%08x\n", I915_READ(CSR_PROGRAM(0)));
> > --
> > 2.13.2
> >
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/gen9_lp: Fix DMC DC counter debugfs output
2018-10-31 20:02 [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output Imre Deak
2018-10-31 20:08 ` Rodrigo Vivi
@ 2018-10-31 20:45 ` Patchwork
2018-11-01 5:33 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-10-31 20:45 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gen9_lp: Fix DMC DC counter debugfs output
URL : https://patchwork.freedesktop.org/series/51837/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5062 -> Patchwork_10678 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10678 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10678, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51837/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10678:
=== IGT changes ===
==== Warnings ====
igt@drv_selftest@live_guc:
fi-skl-iommu: PASS -> SKIP +1
== Known issues ==
Here are the changes found in Patchwork_10678 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
igt@drv_selftest@live_hangcheck:
fi-skl-iommu: PASS -> INCOMPLETE (fdo#108602)
igt@kms_pipe_crc_basic@read-crc-pipe-a:
fi-byt-clapper: PASS -> FAIL (fdo#107362)
==== Possible fixes ====
igt@kms_chamelium@common-hpd-after-suspend:
fi-skl-6700k2: INCOMPLETE (k.org#199541, fdo#105524, fdo#104108) -> PASS
igt@kms_flip@basic-flip-vs-dpms:
fi-skl-6700hq: DMESG-WARN (fdo#105998) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-b:
fi-byt-clapper: FAIL (fdo#107362) -> PASS
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#105524 https://bugs.freedesktop.org/show_bug.cgi?id=105524
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#108602 https://bugs.freedesktop.org/show_bug.cgi?id=108602
k.org#199541 https://bugzilla.kernel.org/show_bug.cgi?id=199541
== Participating hosts (49 -> 43) ==
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-cfl-8109u
== Build changes ==
* Linux: CI_DRM_5062 -> Patchwork_10678
CI_DRM_5062: 3aa71a0d803ee01605f9a3026ddd989a591a73c6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4703: f882a542a3eb24e78e51aa6410a3a67c0efb4e97 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10678: 4a374818885c90694d6089586c53f6e9e8c372b2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4a374818885c drm/i915/gen9_lp: Fix DMC DC counter debugfs output
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10678/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915/gen9_lp: Fix DMC DC counter debugfs output
2018-10-31 20:02 [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output Imre Deak
2018-10-31 20:08 ` Rodrigo Vivi
2018-10-31 20:45 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-11-01 5:33 ` Patchwork
2018-11-05 14:58 ` Imre Deak
2 siblings, 1 reply; 8+ messages in thread
From: Patchwork @ 2018-11-01 5:33 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gen9_lp: Fix DMC DC counter debugfs output
URL : https://patchwork.freedesktop.org/series/51837/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5062_full -> Patchwork_10678_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10678_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10678_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10678_full:
=== IGT changes ===
==== Warnings ====
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: PASS -> SKIP
== Known issues ==
Here are the changes found in Patchwork_10678_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@shrink:
shard-snb: PASS -> INCOMPLETE (fdo#105411, fdo#106886)
igt@gem_exec_schedule@pi-ringfull-bsd:
shard-skl: NOTRUN -> FAIL (fdo#103158)
igt@gem_exec_schedule@preempt-hang-bsd:
shard-apl: PASS -> INCOMPLETE (fdo#103927)
igt@kms_atomic_transition@1x-modeset-transitions-fencing:
shard-skl: NOTRUN -> FAIL (fdo#108470, fdo#107815)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
shard-snb: NOTRUN -> DMESG-WARN (fdo#107956) +1
igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
shard-glk: PASS -> FAIL (fdo#108145)
igt@kms_color@pipe-b-ctm-max:
shard-apl: PASS -> FAIL (fdo#108147)
igt@kms_cursor_crc@cursor-128x128-onscreen:
shard-apl: PASS -> FAIL (fdo#103232) +1
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-skl: NOTRUN -> FAIL (fdo#103232, fdo#103191)
igt@kms_cursor_crc@cursor-64x64-sliding:
shard-glk: PASS -> FAIL (fdo#103232) +1
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-glk: PASS -> INCOMPLETE (k.org#198133, fdo#103359)
igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
shard-glk: PASS -> FAIL (fdo#104873)
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: NOTRUN -> FAIL (fdo#106509, fdo#105454)
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL (fdo#105363)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_plane@pixel-format-pipe-b-planes:
shard-skl: NOTRUN -> DMESG-FAIL (fdo#106885, fdo#103166)
igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb:
shard-apl: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
shard-skl: NOTRUN -> FAIL (fdo#108145) +1
igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
shard-glk: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
shard-skl: NOTRUN -> FAIL (fdo#107815)
==== Possible fixes ====
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: INCOMPLETE (fdo#106023, fdo#106887, fdo#103665) -> PASS
igt@kms_color@pipe-b-legacy-gamma:
shard-skl: FAIL (fdo#104782) -> PASS
igt@kms_cursor_crc@cursor-256x85-random:
shard-glk: FAIL (fdo#103232) -> PASS
igt@kms_cursor_crc@cursor-64x21-random:
shard-apl: FAIL (fdo#103232) -> PASS
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-snb: DMESG-WARN (fdo#102365) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
shard-apl: FAIL (fdo#103167) -> PASS
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-pwrite:
shard-glk: FAIL (fdo#103167) -> PASS
igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
shard-apl: FAIL (fdo#103166) -> PASS +1
igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
shard-glk: FAIL (fdo#103166) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
shard-kbl: FAIL (fdo#99912) -> PASS
igt@pm_rpm@modeset-lpsp-stress-no-wait:
shard-skl: INCOMPLETE (fdo#107807) -> PASS
==== Warnings ====
igt@kms_atomic@crtc_invalid_params_fence:
shard-snb: DMESG-WARN (fdo#107469) -> INCOMPLETE (fdo#105411)
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
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#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
fdo#107469 https://bugs.freedesktop.org/show_bug.cgi?id=107469
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108147 https://bugs.freedesktop.org/show_bug.cgi?id=108147
fdo#108470 https://bugs.freedesktop.org/show_bug.cgi?id=108470
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 (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5062 -> Patchwork_10678
CI_DRM_5062: 3aa71a0d803ee01605f9a3026ddd989a591a73c6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4703: f882a542a3eb24e78e51aa6410a3a67c0efb4e97 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10678: 4a374818885c90694d6089586c53f6e9e8c372b2 @ 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_10678/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output
2018-10-31 20:19 ` Imre Deak
@ 2018-11-01 18:34 ` Rodrigo Vivi
2018-11-01 19:44 ` Imre Deak
0 siblings, 1 reply; 8+ messages in thread
From: Rodrigo Vivi @ 2018-11-01 18:34 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
On Wed, Oct 31, 2018 at 10:19:15PM +0200, Imre Deak wrote:
> On Wed, Oct 31, 2018 at 01:08:06PM -0700, Rodrigo Vivi wrote:
> > On Wed, Oct 31, 2018 at 10:02:20PM +0200, Imre Deak wrote:
> > > On GEN9 LP (BXT/GLK) DC6 is not supported, so don't print the counter
> > > on those platforms. So far we did this on GLK too.
> > >
> > > Testcase: igt/pm_dc/dc6-dpms
> > > Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > > ---
> > > drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
> > > 1 file changed, 7 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > > index 041319d48ca3..e11714aa1ca9 100644
> > > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > > @@ -2916,15 +2916,15 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
> > > seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
> > > CSR_VERSION_MINOR(csr->version));
> > >
> > > - if (IS_BROXTON(dev_priv)) {
> > > - seq_printf(m, "DC3 -> DC5 count: %d\n",
> > > - I915_READ(BXT_CSR_DC3_DC5_COUNT));
> > > - } else if (IS_GEN(dev_priv, 9, 11)) {
> > > - seq_printf(m, "DC3 -> DC5 count: %d\n",
> > > - I915_READ(SKL_CSR_DC3_DC5_COUNT));
> > > + if (INTEL_GEN(dev_priv) > 11)
> > > + goto out;
now that we have this block, should we add a MISSING_CASE here
to make sure we don't forget this later?
> > > +
> > > + seq_printf(m, "DC3 -> DC5 count: %d\n",
> > > + I915_READ(IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT :
> > > + SKL_CSR_DC3_DC5_COUNT));
> > > + if (!IS_GEN9_LP(dev_priv))
> > > seq_printf(m, "DC5 -> DC6 count: %d\n",
> > > I915_READ(SKL_CSR_DC5_DC6_COUNT));
> > > - }
> >
> > What about a simple:
> >
> > - } else if (IS_GEN(dev_priv, 9, 11)) {
> > - } else if (IS_GEN(dev_priv, 9, 10) && !IS_GEMINILAKE(dev_priv)) {
>
> You mean
> - } else if (IS_GEN(dev_priv, 9, 11)) {
> + } else if (IS_GEN(dev_priv, 9, 11) && !IS_GEMINILAKE(dev_priv)) {
> ?
>
> That wouldn't print even the DC5 counter on GLK.
nevermind.
with or without the missing case:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> >
> > >
> > > out:
> > > seq_printf(m, "program base: 0x%08x\n", I915_READ(CSR_PROGRAM(0)));
> > > --
> > > 2.13.2
> > >
> _______________________________________________
> 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] 8+ messages in thread
* Re: [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output
2018-11-01 18:34 ` Rodrigo Vivi
@ 2018-11-01 19:44 ` Imre Deak
0 siblings, 0 replies; 8+ messages in thread
From: Imre Deak @ 2018-11-01 19:44 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Thu, Nov 01, 2018 at 11:34:20AM -0700, Rodrigo Vivi wrote:
> On Wed, Oct 31, 2018 at 10:19:15PM +0200, Imre Deak wrote:
> > On Wed, Oct 31, 2018 at 01:08:06PM -0700, Rodrigo Vivi wrote:
> > > On Wed, Oct 31, 2018 at 10:02:20PM +0200, Imre Deak wrote:
> > > > On GEN9 LP (BXT/GLK) DC6 is not supported, so don't print the counter
> > > > on those platforms. So far we did this on GLK too.
> > > >
> > > > Testcase: igt/pm_dc/dc6-dpms
> > > > Cc: Jyoti Yadav <jyoti.r.yadav@intel.com>
> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > > > ---
> > > > drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
> > > > 1 file changed, 7 insertions(+), 7 deletions(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > > > index 041319d48ca3..e11714aa1ca9 100644
> > > > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > > > @@ -2916,15 +2916,15 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
> > > > seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
> > > > CSR_VERSION_MINOR(csr->version));
> > > >
> > > > - if (IS_BROXTON(dev_priv)) {
> > > > - seq_printf(m, "DC3 -> DC5 count: %d\n",
> > > > - I915_READ(BXT_CSR_DC3_DC5_COUNT));
> > > > - } else if (IS_GEN(dev_priv, 9, 11)) {
> > > > - seq_printf(m, "DC3 -> DC5 count: %d\n",
> > > > - I915_READ(SKL_CSR_DC3_DC5_COUNT));
> > > > + if (INTEL_GEN(dev_priv) > 11)
> > > > + goto out;
>
> now that we have this block, should we add a MISSING_CASE here
> to make sure we don't forget this later?
Ok, will add that.
>
> > > > +
> > > > + seq_printf(m, "DC3 -> DC5 count: %d\n",
> > > > + I915_READ(IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT :
> > > > + SKL_CSR_DC3_DC5_COUNT));
> > > > + if (!IS_GEN9_LP(dev_priv))
> > > > seq_printf(m, "DC5 -> DC6 count: %d\n",
> > > > I915_READ(SKL_CSR_DC5_DC6_COUNT));
> > > > - }
> > >
> > > What about a simple:
> > >
> > > - } else if (IS_GEN(dev_priv, 9, 11)) {
> > > - } else if (IS_GEN(dev_priv, 9, 10) && !IS_GEMINILAKE(dev_priv)) {
> >
> > You mean
> > - } else if (IS_GEN(dev_priv, 9, 11)) {
> > + } else if (IS_GEN(dev_priv, 9, 11) && !IS_GEMINILAKE(dev_priv)) {
> > ?
> >
> > That wouldn't print even the DC5 counter on GLK.
>
> nevermind.
>
> with or without the missing case:
>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
>
>
> >
> > >
> > > >
> > > > out:
> > > > seq_printf(m, "program base: 0x%08x\n", I915_READ(CSR_PROGRAM(0)));
> > > > --
> > > > 2.13.2
> > > >
> > _______________________________________________
> > 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] 8+ messages in thread
* Re: ✓ Fi.CI.IGT: success for drm/i915/gen9_lp: Fix DMC DC counter debugfs output
2018-11-01 5:33 ` ✓ Fi.CI.IGT: " Patchwork
@ 2018-11-05 14:58 ` Imre Deak
0 siblings, 0 replies; 8+ messages in thread
From: Imre Deak @ 2018-11-05 14:58 UTC (permalink / raw)
To: intel-gfx, Rodrigo Vivi
On Thu, Nov 01, 2018 at 05:33:41AM +0000, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915/gen9_lp: Fix DMC DC counter debugfs output
> URL : https://patchwork.freedesktop.org/series/51837/
> State : success
Thanks for the review, pushed to -dinq with the warn for missing case
added.
>
> == Summary ==
>
> = CI Bug Log - changes from CI_DRM_5062_full -> Patchwork_10678_full =
>
> == Summary - WARNING ==
>
> Minor unknown changes coming with Patchwork_10678_full need to be verified
> manually.
>
> If you think the reported changes have nothing to do with the changes
> introduced in Patchwork_10678_full, please notify your bug team to allow them
> to document this new failure mode, which will reduce false positives in CI.
>
>
>
> == Possible new issues ==
>
> Here are the unknown changes that may have been introduced in Patchwork_10678_full:
>
> === IGT changes ===
>
> ==== Warnings ====
>
> igt@pm_rc6_residency@rc6-accuracy:
> shard-kbl: PASS -> SKIP
>
>
> == Known issues ==
>
> Here are the changes found in Patchwork_10678_full that come from known issues:
>
> === IGT changes ===
>
> ==== Issues hit ====
>
> igt@drv_suspend@shrink:
> shard-snb: PASS -> INCOMPLETE (fdo#105411, fdo#106886)
>
> igt@gem_exec_schedule@pi-ringfull-bsd:
> shard-skl: NOTRUN -> FAIL (fdo#103158)
>
> igt@gem_exec_schedule@preempt-hang-bsd:
> shard-apl: PASS -> INCOMPLETE (fdo#103927)
>
> igt@kms_atomic_transition@1x-modeset-transitions-fencing:
> shard-skl: NOTRUN -> FAIL (fdo#108470, fdo#107815)
>
> igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
> shard-skl: NOTRUN -> DMESG-WARN (fdo#107956)
>
> igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
> shard-snb: NOTRUN -> DMESG-WARN (fdo#107956) +1
>
> igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
> shard-glk: PASS -> FAIL (fdo#108145)
>
> igt@kms_color@pipe-b-ctm-max:
> shard-apl: PASS -> FAIL (fdo#108147)
>
> igt@kms_cursor_crc@cursor-128x128-onscreen:
> shard-apl: PASS -> FAIL (fdo#103232) +1
>
> igt@kms_cursor_crc@cursor-256x256-suspend:
> shard-skl: NOTRUN -> FAIL (fdo#103232, fdo#103191)
>
> igt@kms_cursor_crc@cursor-64x64-sliding:
> shard-glk: PASS -> FAIL (fdo#103232) +1
>
> igt@kms_cursor_crc@cursor-64x64-suspend:
> shard-glk: PASS -> INCOMPLETE (k.org#198133, fdo#103359)
>
> igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
> shard-glk: PASS -> FAIL (fdo#104873)
>
> igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
> shard-glk: NOTRUN -> FAIL (fdo#106509, fdo#105454)
>
> igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
> shard-glk: PASS -> FAIL (fdo#105363)
>
> igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
> shard-apl: PASS -> FAIL (fdo#103167) +1
>
> igt@kms_plane@pixel-format-pipe-b-planes:
> shard-skl: NOTRUN -> DMESG-FAIL (fdo#106885, fdo#103166)
>
> igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb:
> shard-apl: NOTRUN -> FAIL (fdo#108145)
>
> igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
> shard-skl: NOTRUN -> FAIL (fdo#108145) +1
>
> igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
> shard-glk: NOTRUN -> FAIL (fdo#108145)
>
> igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
> shard-skl: NOTRUN -> FAIL (fdo#107815)
>
>
> ==== Possible fixes ====
>
> igt@gem_ppgtt@blt-vs-render-ctx0:
> shard-kbl: INCOMPLETE (fdo#106023, fdo#106887, fdo#103665) -> PASS
>
> igt@kms_color@pipe-b-legacy-gamma:
> shard-skl: FAIL (fdo#104782) -> PASS
>
> igt@kms_cursor_crc@cursor-256x85-random:
> shard-glk: FAIL (fdo#103232) -> PASS
>
> igt@kms_cursor_crc@cursor-64x21-random:
> shard-apl: FAIL (fdo#103232) -> PASS
>
> igt@kms_cursor_crc@cursor-64x64-suspend:
> shard-snb: DMESG-WARN (fdo#102365) -> PASS
>
> igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
> shard-apl: FAIL (fdo#103167) -> PASS
>
> igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-pwrite:
> shard-glk: FAIL (fdo#103167) -> PASS
>
> igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
> shard-apl: FAIL (fdo#103166) -> PASS +1
>
> igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
> shard-glk: FAIL (fdo#103166) -> PASS
>
> igt@kms_setmode@basic:
> shard-apl: FAIL (fdo#99912) -> PASS
> shard-kbl: FAIL (fdo#99912) -> PASS
>
> igt@pm_rpm@modeset-lpsp-stress-no-wait:
> shard-skl: INCOMPLETE (fdo#107807) -> PASS
>
>
> ==== Warnings ====
>
> igt@kms_atomic@crtc_invalid_params_fence:
> shard-snb: DMESG-WARN (fdo#107469) -> INCOMPLETE (fdo#105411)
>
>
> fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
> fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
> 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#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
> fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
> fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
> fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
> fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
> fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
> fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
> fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
> fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
> fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
> fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
> fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885
> fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
> fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
> fdo#107469 https://bugs.freedesktop.org/show_bug.cgi?id=107469
> fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
> fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
> fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
> fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
> fdo#108147 https://bugs.freedesktop.org/show_bug.cgi?id=108147
> fdo#108470 https://bugs.freedesktop.org/show_bug.cgi?id=108470
> 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 (6 -> 6) ==
>
> No changes in participating hosts
>
>
> == Build changes ==
>
> * Linux: CI_DRM_5062 -> Patchwork_10678
>
> CI_DRM_5062: 3aa71a0d803ee01605f9a3026ddd989a591a73c6 @ git://anongit.freedesktop.org/gfx-ci/linux
> IGT_4703: f882a542a3eb24e78e51aa6410a3a67c0efb4e97 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
> Patchwork_10678: 4a374818885c90694d6089586c53f6e9e8c372b2 @ 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_10678/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-11-05 14:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-31 20:02 [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output Imre Deak
2018-10-31 20:08 ` Rodrigo Vivi
2018-10-31 20:19 ` Imre Deak
2018-11-01 18:34 ` Rodrigo Vivi
2018-11-01 19:44 ` Imre Deak
2018-10-31 20:45 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-11-01 5:33 ` ✓ Fi.CI.IGT: " Patchwork
2018-11-05 14:58 ` Imre Deak
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.