drm/i915/pmu: Fix building without CONFIG_PM
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/1 drm/i915/pmu: Fix building without CONFIG_PM
From: Tvrtko Ursulin <[email protected]>
We are peeking into PM internals so have to guard that with IS_ENABLED(CONFIG_PM) to build where the former is disabled.
--- drivers/gpu/drm/i915/i915_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_pmu.c +1 -1
@@ -451,7 +451,7 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked)if (!locked)spin_unlock_irqrestore (&i915->pmu.lock, flags); - }else { + }else if (IS_ENABLED (CONFIG_PM )) {struct pci_dev *pdev = i915->drm.pdev;struct device *kdev = &pdev->dev;unsigned long flags2;
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Tvrtko Ursulin (2018-02-07 15:55:09)
Quoted 4 lines
From: Tvrtko Ursulin <[email protected]>
We are peeking into PM internals so have to guard that with
IS_ENABLED(CONFIG_PM)to build where the former is disabled.
Compiler still parses the dead branch and complains about the missing struct members.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/pmu: Fix building without CONFIG_PM
In reply to Tvrtko UrsulinAs we peek inside struct device to query members guarded by CONFIG_PM, so must be the code.
--- drivers/gpu/drm/i915/i915_pmu.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_pmu.c +23 -10
@@ -415,22 +415,32 @@ static int i915_pmu_event_init(struct perf_event *event)return 0 ; } -static u64 get_rc6 (struct drm_i915_private *i915,bool locked) +static u64 __get_rc6 (struct drm_i915_private *i915) { -unsigned long flags;u64 val; -if (intel_runtime_pm_get_if_in_use (i915)) { - val =intel_rc6_residency_ns (i915,IS_VALLEYVIEW (i915) ? -VLV_GT_RENDER_RC6 : -GEN6_GT_GFX_RC6 ); + val =intel_rc6_residency_ns (i915, +IS_VALLEYVIEW (i915) ? +VLV_GT_RENDER_RC6 : +GEN6_GT_GFX_RC6 ); -if (HAS_RC6p (i915)) - val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6p); +if (HAS_RC6p (i915)) + val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6p); + +if (HAS_RC6pp (i915)) + val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6pp); + +return val; +} -if (HAS_RC6pp (i915)) - val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6pp); +static u64 get_rc6 (struct drm_i915_private *i915,bool locked) +{ +#if IS_ENABLED (CONFIG_PM ) +unsigned long flags; +u64 val; +if (intel_runtime_pm_get_if_in_use (i915)) { + val =__get_rc6 (i915);intel_runtime_pm_put (i915);/*
@@ -487,6 +497,9 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked) }return val; +#else +return __get_rc6 (i915); +#endif }static u64 __i915_pmu_event_read (struct perf_event *event,bool locked)
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 60 lines · Chris Wilson
As we peek inside struct device to query members guarded by
CONFIG_PM, so must be the code.Reported-by kbuild test robot <[email protected]>Fixes 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")Signed-off-by Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/i915_pmu.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_pmu.c +20
-10@@ -415,22 +415,32 @@ static int i915_pmu_event_init(struct perf_event *event)return 0 ; } -static u64 get_rc6 (struct drm_i915_private *i915,bool locked) +static u64 __get_rc6 (struct drm_i915_private *i915) { -unsigned long flags;u64 val; -if (intel_runtime_pm_get_if_in_use (i915)) { - val =intel_rc6_residency_ns (i915,IS_VALLEYVIEW (i915) ? -VLV_GT_RENDER_RC6 : -GEN6_GT_GFX_RC6 ); + val =intel_rc6_residency_ns (i915, +IS_VALLEYVIEW (i915) ? +VLV_GT_RENDER_RC6 : +GEN6_GT_GFX_RC6 ); -if (HAS_RC6p (i915)) - val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6p); +if (HAS_RC6p (i915)) + val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6p); + +if (HAS_RC6pp (i915)) + val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6pp); + +return val; +} -if (HAS_RC6pp (i915)) - val +=intel_rc6_residency_ns (i915, GEN6_GT_GFX_RC6pp); +static u64 get_rc6 (struct drm_i915_private *i915,bool locked) +{ +#if IS_ENABLED (CONFIG_PM ) +unsigned long flags; +u64 val; +if (intel_runtime_pm_get_if_in_use (i915)) { + val =__get_rc6 (i915);intel_runtime_pm_put (i915);/*
drivers/gpu/drm/i915/i915_pmu.c static u64 get_rc6(struct drm_i915_private *i915, bool locked) · line 505
Quoted 9 lines
drivers/gpu/drm/i915/i915_pmu.c +3
-0@@ -487,6 +497,9 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked) }return val; +#else +return __get_rc6 (i915); +#endif }static u64 __i915_pmu_event_read (struct perf_event *event,bool locked)
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/pmu: Fix building without CONFIG_PM
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915/pmu: Fix building without CONFIG_PM
URL : https://patchwork.freedesktop.org/series/37823/
State : success
== Summary ==
Series 37823v1 drm/i915/pmu: Fix building without CONFIG_PM
https://patchwork.freedesktop.org/api/1.0/series/37823/revisions/1/mbox/
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:422s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:375s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:492s 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:484s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:484s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:468s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:456s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:569s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:579s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:421s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:284s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:512s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:396s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:415s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:458s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:425s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:463s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:492s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:450s 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:605s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:427s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:507s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:524s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:490s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:473s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:412s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:435s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:525s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:393s
Blacklisted hosts:
fi-glk-dsi total:288 pass:257 dwarn:0 dfail:0 fail:1 skip:30 time:486s
94ca1ebb0652da416401b22e227d0d95eb382b22 drm-tip: 2018y-02m-07d-13h-38m-30s UTC integration manifest 0af908559562 drm/i915/pmu: Fix building without CONFIG_PM
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7925/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/pmu: Fix building without CONFIG_PM (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915/pmu: Fix building without CONFIG_PM (rev2)
URL : https://patchwork.freedesktop.org/series/37823/
State : success
== Summary ==
Series 37823v2 drm/i915/pmu: Fix building without CONFIG_PM
https://patchwork.freedesktop.org/api/1.0/series/37823/revisions/2/mbox/
Test debugfs_test:
Subgroup read_all_entries:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-b:
pass -> FAIL (fi-skl-guc) fdo#103191fdo#103713
fdo#103191
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:423s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:376s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:484s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:286s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:479s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:487s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:468s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:458s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:565s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:575s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:416s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:284s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:510s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:391s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:411s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:458s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:414s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:456s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:493s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:450s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:502s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:600s 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:506s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:524s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:486s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:476s fi-skl-guc total:288 pass:259 dwarn:0 dfail:0 fail:1 skip:28 time:412s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:432s fi-snb-2520m total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:398s
Blacklisted hosts:
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:468s
94ca1ebb0652da416401b22e227d0d95eb382b22 drm-tip: 2018y-02m-07d-13h-38m-30s UTC integration manifest 84bf337d4c2b drm/i915/pmu: Fix building without CONFIG_PM
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7926/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for drm/i915/pmu: Fix building without CONFIG_PM (rev2)
Quoting Patchwork (2018-02-07 16:36:29)
Quoted 11 lines
== Series Details ==
Series: drm/i915/pmu: Fix building without
CONFIG_PM(rev2)
URL : https://patchwork.freedesktop.org/series/37823/
State : success== Summary ==
Series 37823v2 drm/i915/pmu: Fix building without
CONFIG_PM
https://patchwork.freedesktop.org/api/1.0/series/37823/revisions/2/mbox/
Quoted 6 lines
Test
debugfs_test:Subgroup read_all_entries: pass -> INCOMPLETE (fi-snb-2520m) fdo#103713 Test kms_pipe_crc_basic: Subgroup read-crc-pipe-b: pass -> FAIL (fi-skl-guc) fdo#103191
And applied; 0-day at its second best.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for drm/i915/pmu: Fix building without CONFIG_PM (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915/pmu: Fix building without CONFIG_PM (rev2)
URL : https://patchwork.freedesktop.org/series/37823/
State : warning
== Summary ==
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 perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252
Subgroup enable-disable:
fail -> PASS (shard-apl) fdo#103715
Subgroup buffer-fill:
fail -> PASS (shard-apl) fdo#103755
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-spr-indfb-draw-pwrite:
pass -> SKIP (shard-snb)
Test gem_eio:
Subgroup in-flight:
dmesg-warn -> PASS (shard-snb) fdo#104058fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103715 https://bugs.freedesktop.org/show_bug.cgi?id=103715
fdo#103755 https://bugs.freedesktop.org/show_bug.cgi?id=103755
fdo#104058 https://bugs.freedesktop.org/show_bug.cgi?id=104058
shard-apl total:3419 pass:1770 dwarn:1 dfail:0 fail:21 skip:1626 time:12411s shard-hsw total:3442 pass:1758 dwarn:1 dfail:0 fail:11 skip:1671 time:11927s shard-snb total:3442 pass:1349 dwarn:1 dfail:0 fail:10 skip:2082 time:6524s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7926/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx