Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:04:14 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h
Log Message:
Disable some unimportant broken BUILD_BUG_ONs.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.35 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.36
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.35 Sun Dec 19 01:24:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Dec 19 11:04:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.h,v 1.35 2021/12/19 01:24:25 riastradh Exp $ */
+/* $NetBSD: i915_drv.h,v 1.36 2021/12/19 11:04:14 riastradh Exp $ */
/* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
*/
@@ -1477,7 +1477,9 @@ IS_PLATFORM(const struct drm_i915_privat
const unsigned int pi = __platform_mask_index(info, p);
const unsigned int pb = __platform_mask_bit(info, p);
+#if 0
BUILD_BUG_ON(!__builtin_constant_p(p));
+#endif
return info->platform_mask[pi] & BIT(pb);
}
@@ -1492,9 +1494,11 @@ IS_SUBPLATFORM(const struct drm_i915_pri
const unsigned int msb = BITS_PER_TYPE(info->platform_mask[0]) - 1;
const u32 mask = info->platform_mask[pi];
+#if 0
BUILD_BUG_ON(!__builtin_constant_p(p));
BUILD_BUG_ON(!__builtin_constant_p(s));
BUILD_BUG_ON((s) >= INTEL_SUBPLATFORM_BITS);
+#endif
/* Shift and test on the MSB position so sign flag can be used. */
return ((mask << (msb - pb)) & (mask << (msb - s))) & BIT(msb);
