[PATCH] drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled

[PATCH] drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled

[Chris Wilson]

Since we depending upon the runtime powermanagement to providing timing
information in lieu of HW counters when the device is asleep, we can
only provide the rc6 PMU event when CONFIG_PM is enabled.

Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/i915_pmu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index bfc402d47609..6b35467b3aeb 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -344,10 +344,12 @@ config_status(struct drm_i915_private *i915, u64 config)
 		break;
 	case I915_PMU_INTERRUPTS:
 		break;
+#if IS_ENABLED(CONFIG_PM)
 	case I915_PMU_RC6_RESIDENCY:
 		if (!HAS_RC6(i915))
 			return -ENODEV;
 		break;
+#endif
 	default:
 		return -ENOENT;
 	}
@@ -415,6 +417,7 @@ static int i915_pmu_event_init(struct perf_event *event)
 	return 0;
 }
 
+#if IS_ENABLED(CONFIG_PM)
 static u64 get_rc6(struct drm_i915_private *i915, bool locked)
 {
 	unsigned long flags;
@@ -488,6 +491,7 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked)
 
 	return val;
 }
+#endif
 
 static u64 __i915_pmu_event_read(struct perf_event *event, bool locked)
 {
@@ -526,9 +530,11 @@ static u64 __i915_pmu_event_read(struct perf_event *event, bool locked)
 		case I915_PMU_INTERRUPTS:
 			val = count_interrupts(i915);
 			break;
+#if IS_ENABLED(CONFIG_PM)
 		case I915_PMU_RC6_RESIDENCY:
 			val = get_rc6(i915, locked);
 			break;
+#endif
 		}
 	}
 
@@ -799,7 +805,9 @@ create_event_attributes(struct drm_i915_private *i915)
 		__event(I915_PMU_ACTUAL_FREQUENCY, "actual-frequency", "MHz"),
 		__event(I915_PMU_REQUESTED_FREQUENCY, "requested-frequency", "MHz"),
 		__event(I915_PMU_INTERRUPTS, "interrupts", NULL),
+#if IS_ENABLED(CONFIG_PM)
 		__event(I915_PMU_RC6_RESIDENCY, "rc6-residency", "ns"),
+#endif
 	};
 	static const struct {
 		enum drm_i915_pmu_engine_sample sample;
-- 
2.16.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled

[Patchwork]

== Series Details ==

Series: drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled
URL   : https://patchwork.freedesktop.org/series/37818/
State : success

== Summary ==

Series 37818v1 drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled
https://patchwork.freedesktop.org/api/1.0/series/37818/revisions/1/mbox/

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                pass       -> INCOMPLETE (fi-snb-2520m) fdo#103713

fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:420s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:428s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:378s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:494s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:287s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:483s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:491s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:474s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:460s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:571s
fi-cnl-y3        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:589s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:417s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:288s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:511s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:392s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:412s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:463s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:419s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:458s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:504s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:458s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:499s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:596s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:425s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:511s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:527s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:485s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:497s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:414s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:429s
fi-snb-2520m     total:245  pass:211  dwarn:0   dfail:0   fail:0   skip:33 
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:397s
Blacklisted hosts:
fi-glk-dsi       total:288  pass:257  dwarn:0   dfail:0   fail:1   skip:30  time:478s

94ca1ebb0652da416401b22e227d0d95eb382b22 drm-tip: 2018y-02m-07d-13h-38m-30s UTC integration manifest
c639753f191a drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7923/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: failure for drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled

[Patchwork]

== Series Details ==

Series: drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled
URL   : https://patchwork.freedesktop.org/series/37818/
State : failure

== Summary ==

Test gem_eio:
        Subgroup in-flight:
                dmesg-warn -> PASS       (shard-snb) fdo#104058
Test perf:
        Subgroup oa-exponents:
                pass       -> FAIL       (shard-apl) fdo#102254
        Subgroup buffer-fill:
                fail       -> PASS       (shard-apl) fdo#103755
        Subgroup enable-disable:
                fail       -> PASS       (shard-apl) fdo#103715
Test kms_cursor_crc:
        Subgroup cursor-128x128-suspend:
                skip       -> PASS       (shard-snb) fdo#103880
Test kms_vblank:
        Subgroup pipe-a-ts-continuation-suspend:
                pass       -> INCOMPLETE (shard-hsw)
Test kms_flip:
        Subgroup modeset-vs-vblank-race-interruptible:
                fail       -> PASS       (shard-hsw) fdo#103060
        Subgroup 2x-flip-vs-expired-vblank:
                fail       -> PASS       (shard-hsw) fdo#102887
Test kms_sysfs_edid_timing:
                pass       -> WARN       (shard-apl) fdo#100047

fdo#104058 https://bugs.freedesktop.org/show_bug.cgi?id=104058
fdo#102254 https://bugs.freedesktop.org/show_bug.cgi?id=102254
fdo#103755 https://bugs.freedesktop.org/show_bug.cgi?id=103755
fdo#103715 https://bugs.freedesktop.org/show_bug.cgi?id=103715
fdo#103880 https://bugs.freedesktop.org/show_bug.cgi?id=103880
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047

shard-apl        total:3419 pass:1768 dwarn:1   dfail:0   fail:22  skip:1626 time:12394s
shard-hsw        total:3355 pass:1711 dwarn:1   dfail:0   fail:8   skip:1633 time:11454s
shard-snb        total:3442 pass:1351 dwarn:1   dfail:0   fail:10  skip:2080 time:6615s
Blacklisted hosts:
shard-kbl        total:3411 pass:1891 dwarn:1   dfail:0   fail:21  skip:1497 time:9440s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7923/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/pmu: Disable rc6 reporting if runtime-pm is disabled

[Imre Deak]

On Wed, Feb 07, 2018 at 03:13:36PM +0000, Chris Wilson wrote:
> Since we depending upon the runtime powermanagement to providing timing
> information in lieu of HW counters when the device is asleep, we can
> only provide the rc6 PMU event when CONFIG_PM is enabled.
> 
> Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Hm, doesn't the counter stop only during system/runtime suspend? If so
those wouldn't be available w/o CONFIG_PM, hence we wouldn't have a
problem?

> ---
>  drivers/gpu/drm/i915/i915_pmu.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
> index bfc402d47609..6b35467b3aeb 100644
> --- a/drivers/gpu/drm/i915/i915_pmu.c
> +++ b/drivers/gpu/drm/i915/i915_pmu.c
> @@ -344,10 +344,12 @@ config_status(struct drm_i915_private *i915, u64 config)
>  		break;
>  	case I915_PMU_INTERRUPTS:
>  		break;
> +#if IS_ENABLED(CONFIG_PM)
>  	case I915_PMU_RC6_RESIDENCY:
>  		if (!HAS_RC6(i915))
>  			return -ENODEV;
>  		break;
> +#endif
>  	default:
>  		return -ENOENT;
>  	}
> @@ -415,6 +417,7 @@ static int i915_pmu_event_init(struct perf_event *event)
>  	return 0;
>  }
>  
> +#if IS_ENABLED(CONFIG_PM)
>  static u64 get_rc6(struct drm_i915_private *i915, bool locked)
>  {
>  	unsigned long flags;
> @@ -488,6 +491,7 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked)
>  
>  	return val;
>  }
> +#endif
>  
>  static u64 __i915_pmu_event_read(struct perf_event *event, bool locked)
>  {
> @@ -526,9 +530,11 @@ static u64 __i915_pmu_event_read(struct perf_event *event, bool locked)
>  		case I915_PMU_INTERRUPTS:
>  			val = count_interrupts(i915);
>  			break;
> +#if IS_ENABLED(CONFIG_PM)
>  		case I915_PMU_RC6_RESIDENCY:
>  			val = get_rc6(i915, locked);
>  			break;
> +#endif
>  		}
>  	}
>  
> @@ -799,7 +805,9 @@ create_event_attributes(struct drm_i915_private *i915)
>  		__event(I915_PMU_ACTUAL_FREQUENCY, "actual-frequency", "MHz"),
>  		__event(I915_PMU_REQUESTED_FREQUENCY, "requested-frequency", "MHz"),
>  		__event(I915_PMU_INTERRUPTS, "interrupts", NULL),
> +#if IS_ENABLED(CONFIG_PM)
>  		__event(I915_PMU_RC6_RESIDENCY, "rc6-residency", "ns"),
> +#endif
>  	};
>  	static const struct {
>  		enum drm_i915_pmu_engine_sample sample;
> -- 
> 2.16.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