Skip to contentSkip to conversation

drm/i915: Always evaluate GEM_BUG_ON expression

PATCH In review Joonas Lahtinen 4 participants 4 messages Nov 11, 2016

Subsystems (2)
lore
Share & tools
lore

Joonas Lahtinen

author maintainer
#0 lore raw

PATCH 1/1 drm/i915: Always evaluate GEM_BUG_ON expression

Evaluate GEM_BUG_ON expression similar to actual BUG_ON even if DEBUG_GEM is disabled.

Cc Arnd Bergmann <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem.h +1 -1
index 51ec793..d141676 100644
@@ -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) do { if (expr) {} } while(0)
 #endif
 
 #define I915_NUM_ENGINES 5
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 16 lines · Joonas Lahtinen

Evaluate GEM_BUG_ON expression similar to actual BUG_ON even if DEBUG_GEM is disabled.

Cc Arnd Bergmann <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[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
index 51ec793..d141676 100644

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) do { if (expr) {} } while(0)
 #endif

Mentioned on irc, that I'm not that keen on having the side-effects around. Suggestion was while (0) do { if (expr) {} } while (0)

But spot the dev who touched gem code without enabling the debug :-p -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
#2 lore raw
Quoted 12 lines · Chris Wilson
Quoted 11 lines · Joonas Lahtinen

Evaluate GEM_BUG_ON expression similar to actual BUG_ON even if DEBUG_GEM is disabled.

Cc Arnd Bergmann <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines

drivers/gpu/drm/i915/i915_gem.h line 32

Quoted 11 lines
drivers/gpu/drm/i915/i915_gem.h +1 -1
index 51ec793..d141676 100644
@@ -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) do { if (expr) {} } while(0)
 #endif

Mentioned on irc, that I'm not that keen on having the side-effects around. Suggestion was while (0) do { if (expr) {} } while (0)

Sounds good to me.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✓ Fi.CI.BAT: success for drm/i915: Always evaluate GEM_BUG_ON expression

In reply to Joonas Lahtinen
== Series Details ==

== Series Details ==

Series: drm/i915: Always evaluate GEM_BUG_ON expression
URL : https://patchwork.freedesktop.org/series/15156/
State : success

== Summary ==

Series 15156v1 drm/i915: Always evaluate GEM_BUG_ON expression
https://patchwork.freedesktop.org/api/1.0/series/15156/revisions/1/mbox/

fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:204  dwarn:0   dfail:0   fail:0   skip:40 
fi-bxt-t5700     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-hsw-4770      total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-ilk-650       total:244  pass:191  dwarn:0   dfail:0   fail:0   skip:53 
fi-ivb-3520m     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-ivb-3770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-7200u     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:223  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:244  pass:222  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-snb-2600      total:244  pass:211  dwarn:0   dfail:0   fail:0   skip:33 

0ecf26a8d5fc565fca1da9d66f65863de5e00ead drm-intel-nightly: 2016y-11m-11d-08h-21m-01s UTC integration manifest 9dd4d06 drm/i915: Always evaluate GEM_BUG_ON expression

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2965/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx