drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/1 drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
From: Tvrtko Ursulin <[email protected]>
Move the BUILD_BUG_ONs for busy-wait duration outside the _wait_for_atomic macro as discussed on the mailing list.
--- drivers/gpu/drm/i915/intel_drv.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +10 -3
@@ -88,7 +88,6 @@int cpu, ret, timeout = (US ) *1000 ; \u64 base; \_WAIT_FOR_ATOMIC_CHECK (ATOMIC ); \ -BUILD_BUG_ON ((US ) >50000 ); \if (!(ATOMIC )) { \preempt_disable (); \ cpu =smp_processor_id (); \
@@ -130,8 +129,16 @@ ret__; \ }) -#define wait_for_atomic (COND ,MS ) _wait_for_atomic((COND), (MS) * 1000, 1) -#define wait_for_atomic_us (COND ,US ) _wait_for_atomic((COND), (US), 1) +#define wait_for_atomic_us (COND ,US ) \ +({ \ + int ret__; \ + BUILD_BUG_ON(!__builtin_constant_p(US)); \ + BUILD_BUG_ON((US) > 50000); \ + ret__ = _wait_for_atomic((COND), (US), 1); \ + ret__; \ +}) + +#define wait_for_atomic (COND ,MS ) wait_for_atomic_us((COND), (MS) * 1000)#define KHz (x) (1000 * (x))#define MHz (x) KHz(1000 * (x))
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
== Series Details ==
== Series Details ==
Series: drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
URL : https://patchwork.freedesktop.org/series/23020/
State : success
== Summary ==
Series 23020v1 drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
https://patchwork.freedesktop.org/api/1.0/series/23020/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
pass -> DMESG-WARN (fi-kbl-7560u) fdo#100125
Test kms_force_connector_basic:
Subgroup force-connector-state:
skip -> PASS (fi-snb-2520m)fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:432s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:432s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:581s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:505s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:553s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:485s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:482s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:413s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:402s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:422s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:493s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:468s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:460s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:573s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:449s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:574s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:467s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:492s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:430s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:530s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:404s
df0abb1113368aa0af16907c769116ff6273812f drm-tip: 2017y-04m-13d-15h-12m-23s UTC integration manifest 0297bd2 drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4503/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 30 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Move the
BUILD_BUG_ONsfor busy-wait duration outside the_wait_for_atomicmacro as discussed on the mailing list.Signed-off-by Tvrtko Ursulin <[email protected]>Suggested-by Michal Wajdeczko <[email protected]>Fixes 1d1a9774e404 ("drm/i915: Extend intel_wait_for_register_fw() with fast timeout")Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/intel_drv.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -88,7 +88,6 @@int cpu, ret, timeout = (US ) *1000 ; \u64 base; \_WAIT_FOR_ATOMIC_CHECK (ATOMIC ); \ -BUILD_BUG_ON ((US ) >50000 ); \if (!(ATOMIC )) { \preempt_disable (); \ cpu =smp_processor_id (); \@@ -130,8 +129,16 @@ ret__; \ })
drivers/gpu/drm/i915/intel_drv.h line 139
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +8
-2-#define wait_for_atomic (COND ,MS ) _wait_for_atomic((COND), (MS) * 1000, 1) -#define wait_for_atomic_us (COND ,US ) _wait_for_atomic((COND), (US), 1) +#define wait_for_atomic_us (COND ,US ) \ +({ \ + int ret__; \ + BUILD_BUG_ON(!__builtin_constant_p(US)); \ + BUILD_BUG_ON((US) > 50000); \ + ret__ = _wait_for_atomic((COND), (US), 1); \ + ret__; \ +})
Do we need ret__ here? Doesn't _wait_for_atomic() act as the expression providing the value to the caller?
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH v2 1/1 drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
From: Tvrtko Ursulin <[email protected]>
Move the BUILD_BUG_ONs for busy-wait duration outside the _wait_for_atomic macro as discussed on the mailing list.
v2: Simplify the macro by omitting the ret__ local. (Chris Wilson)
--- drivers/gpu/drm/i915/intel_drv.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +8 -3
@@ -88,7 +88,6 @@int cpu, ret, timeout = (US ) *1000 ; \u64 base; \_WAIT_FOR_ATOMIC_CHECK (ATOMIC ); \ -BUILD_BUG_ON ((US ) >50000 ); \if (!(ATOMIC )) { \preempt_disable (); \ cpu =smp_processor_id (); \
@@ -130,8 +129,14 @@ ret__; \ }) -#define wait_for_atomic (COND ,MS ) _wait_for_atomic((COND), (MS) * 1000, 1) -#define wait_for_atomic_us (COND ,US ) _wait_for_atomic((COND), (US), 1) +#define wait_for_atomic_us (COND ,US ) \ +({ \ + BUILD_BUG_ON(!__builtin_constant_p(US)); \ + BUILD_BUG_ON((US) > 50000); \ + _wait_for_atomic((COND), (US), 1); \ +}) + +#define wait_for_atomic (COND ,MS ) wait_for_atomic_us((COND), (MS) * 1000)#define KHz (x) (1000 * (x))#define MHz (x) KHz(1000 * (x))
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Move the
BUILD_BUG_ONsfor busy-wait duration outside the_wait_for_atomicmacro as discussed on the mailing list.
Quoted 8 lines
v2: Simplify the macro by omitting the
ret__local. (Chris Wilson)Signed-off-by Tvrtko Ursulin <[email protected]>Suggested-by Michal Wajdeczko <[email protected]>Fixes 1d1a9774e404 ("drm/i915: Extend intel_wait_for_register_fw() with fast timeout")Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>---
-Michal
Quoted 35 lines
drivers/gpu/drm/i915/intel_drv.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_drv.h +8
-3@@ -88,7 +88,6 @@int cpu, ret, timeout = (US ) *1000 ; \u64 base; \_WAIT_FOR_ATOMIC_CHECK (ATOMIC ); \ -BUILD_BUG_ON ((US ) >50000 ); \if (!(ATOMIC )) { \preempt_disable (); \ cpu =smp_processor_id (); \@@ -130,8 +129,14 @@ ret__; \ }) -#define wait_for_atomic (COND ,MS ) _wait_for_atomic((COND), (MS) * 1000, 1) -#define wait_for_atomic_us (COND ,US ) _wait_for_atomic((COND), (US), 1) +#define wait_for_atomic_us (COND ,US ) \ +({ \ + BUILD_BUG_ON(!__builtin_constant_p(US)); \ + BUILD_BUG_ON((US) > 50000); \ + _wait_for_atomic((COND), (US), 1); \ +}) + +#define wait_for_atomic (COND ,MS ) wait_for_atomic_us((COND), (MS) * 1000)#define KHz (x) (1000 * (x))#define MHz (x) KHz(1000 * (x))Signature · 1 line
2.9.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw (rev2)
URL : https://patchwork.freedesktop.org/series/23020/
State : failure
== Summary ==
Series 23020v2 drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
https://patchwork.freedesktop.org/api/1.0/series/23020/revisions/2/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> INCOMPLETE (fi-bsw-n3050)fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:430s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:423s fi-bsw-n3050 total:241 pass:206 dwarn:0 dfail:0 fail:0 skip:34 fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:511s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:484s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:480s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:409s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:411s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:423s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:486s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:468s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:459s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:563s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:451s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:572s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:463s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:499s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:432s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:531s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:398s
4d374295ace9e57d83483341e2ad07cad5baf912 drm-tip: 2017y-04m-18d-10h-08m-05s UTC integration manifest cf1a97e drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4510/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915: Fix GCC 4.4 build issue with __intel_wait_for_register_fw (rev2)
Quoted 11 lines · Patchwork
== Series Details ==
Series: drm/i915: Fix GCC 4.4 build issue with
__intel_wait_for_register_fw(rev2)
URL : https://patchwork.freedesktop.org/series/23020/
State : failure== Summary ==
Series 23020v2 drm/i915: Fix GCC 4.4 build issue with
__intel_wait_for_register_fw
https://patchwork.freedesktop.org/api/1.0/series/23020/revisions/2/mbox/
Quoted 6 lines
Test
gem_exec_suspend:Subgroup basic-s4-devices: dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125 Test pm_rpm: Subgroup basic-pci-d3-state: pass -> INCOMPLETE (fi-bsw-n3050)
Unrelated BSW hang:
https://bugs.freedesktop.org/show_bug.cgi?id=100718
Quoted 23 lines
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:430s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:423s fi-bsw-n3050 total:241 pass:206 dwarn:0 dfail:0 fail:0 skip:34 fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:511s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:484s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:480s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:409s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:411s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:423s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:486s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:468s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:459s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:563s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:451s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:572s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:463s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:499s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:432s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:531s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:398s
Quoted 2 lines
4d374295ace9e57d83483341e2ad07cad5baf912drm-tip: 2017y-04m-18d-10h-08m-05s UTC integration manifest cf1a97e drm/i915: Fix GCC 4.4 build issue with__intel_wait_for_register_fw
Pushed, thanks for the review!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx