drm/i915: allow GEM_BUG_ON expr checking with !DEBUG_GEM
Subsystems (2)
PATCH 1/1 drm/i915: allow GEM_BUG_ON expr checking with !DEBUG_GEM
Use BUILD_BUG_ON_INVALID(expr) in GEM_BUG_ON when building without DEBUG_GEM. This means the compiler can now check the validity of expr without generating any code, in turn preventing us from inadvertently breaking the build when DEBUG_GEM is not enabled.
--- drivers/gpu/drm/i915/i915_gem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem.h +1 -1
@@ -28,7 +28,7 @@#ifdef CONFIG_DRM_I915_DEBUG_GEM #define GEM_BUG_ON (expr) BUG_ON(expr)#else -#define GEM_BUG_ON (expr) do { } while (0) +#define GEM_BUG_ON (expr) BUILD_BUG_ON_INVALID(expr)#endif #define I915_NUM_ENGINES 5
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: warning for drm/i915: allow GEM_BUG_ON expr checking with !DEBUG_GEM
== Series Details ==
== Series Details ==
Series: drm/i915: allow GEM_BUG_ON expr checking with !DEBUG_GEM
URL : https://patchwork.freedesktop.org/series/16298/
State : warning
== Summary ==
Series 16298v1 drm/i915: allow GEM_BUG_ON expr checking with !DEBUG_GEM
https://patchwork.freedesktop.org/api/1.0/series/16298/revisions/1/mbox/
Test kms_force_connector_basic:
Subgroup force-connector-state:
pass -> DMESG-WARN (fi-snb-2520m)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-b:
pass -> DMESG-WARN (fi-ivb-3770)fi-bdw-5557u total:247 pass:232 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:247 pass:207 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:247 pass:194 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:247 pass:224 dwarn:1 dfail:0 fail:0 skip:22 fi-kbl-7500u total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:247 pass:223 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:247 pass:214 dwarn:1 dfail:0 fail:0 skip:32 fi-snb-2600 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33
16c2727017476099091b70f53da7eb365f2a001e drm-tip: 2016y-12m-02d-16h-19m-57s UTC integration manifest a909a17 drm/i915: allow GEM_BUG_ON expr checking with !DEBUG_GEM
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3177/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Matthew Auld
Use
BUILD_BUG_ON_INVALID(expr)inGEM_BUG_ONwhen building withoutDEBUG_GEM. This means the compiler can now check the validity of expr without generating any code, in turn preventing us from inadvertently breaking the build whenDEBUG_GEMis not enabled.Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_gem.h +0
-0
drivers/gpu/drm/i915/i915_gem.h line 32
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.h +1
-1@@ -28,7 +28,7 @@#ifdef CONFIG_DRM_I915_DEBUG_GEM #define GEM_BUG_ON (expr) BUG_ON(expr)#else -#define GEM_BUG_ON (expr) do { } while (0) +#define GEM_BUG_ON (expr) BUILD_BUG_ON_INVALID(expr)#endif
Lgtm, compiles both ways and picks up an error when DEBUG_GEM is disabled.
-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