From 219470f60df51fee093ac90e53073ed2c9679b75 Mon Sep 17 00:00:00 2001 From: Young Jin Yoon Date: Tue, 27 Feb 2024 16:45:04 +0000 Subject: [PATCH] build: remove static_assert for drm header change Removed static_assert for reset_stats before updating drm header to v2.0-r23. Related-To: GSD-5673 Signed-off-by: Young Jin Yoon --- shared/source/os_interface/linux/drm_wrappers_checks.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/shared/source/os_interface/linux/drm_wrappers_checks.cpp b/shared/source/os_interface/linux/drm_wrappers_checks.cpp index 2f7ed13589..2057d16515 100644 --- a/shared/source/os_interface/linux/drm_wrappers_checks.cpp +++ b/shared/source/os_interface/linux/drm_wrappers_checks.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -120,13 +120,12 @@ static_assert(offsetof(GemWait, boHandle) == offsetof(drm_i915_gem_wait, bo_hand static_assert(offsetof(GemWait, flags) == offsetof(drm_i915_gem_wait, flags)); static_assert(offsetof(GemWait, timeoutNs) == offsetof(drm_i915_gem_wait, timeout_ns)); -static_assert(sizeof(ResetStats) == sizeof(drm_i915_reset_stats)); +static_assert(sizeof(ResetStats) >= sizeof(drm_i915_reset_stats)); static_assert(offsetof(ResetStats, contextId) == offsetof(drm_i915_reset_stats, ctx_id)); static_assert(offsetof(ResetStats, flags) == offsetof(drm_i915_reset_stats, flags)); static_assert(offsetof(ResetStats, resetCount) == offsetof(drm_i915_reset_stats, reset_count)); static_assert(offsetof(ResetStats, batchActive) == offsetof(drm_i915_reset_stats, batch_active)); static_assert(offsetof(ResetStats, batchPending) == offsetof(drm_i915_reset_stats, batch_pending)); -static_assert(offsetof(ResetStats, reserved) == offsetof(drm_i915_reset_stats, pad)); static_assert(sizeof(GetParam) == sizeof(struct drm_i915_getparam)); static_assert(offsetof(GetParam, param) == offsetof(struct drm_i915_getparam, param)); @@ -169,4 +168,4 @@ static_assert(offsetof(ContextEnginesLoadBalance<3>, engineIndex) == offsetof(I9 static_assert(offsetof(ContextEnginesLoadBalance<3>, numSiblings) == offsetof(I915ContextEnginesLoadBalance, num_siblings)); static_assert(offsetof(ContextEnginesLoadBalance<3>, flags) == offsetof(I915ContextEnginesLoadBalance, flags)); static_assert(offsetof(ContextEnginesLoadBalance<3>, engines) == offsetof(I915ContextEnginesLoadBalance, engines)); -} // namespace NEO \ No newline at end of file +} // namespace NEO