GCC 17 adds -Wconstant-logical-operand to -Wall. It warns when an operand
of && or || folds to a constant other than 0 or 1. Three places break the
build with CONFIG_WERROR=y:
include/drm/intel/reg_bits.h:27:48: error: use of logical '&&' with constant
operand '256' [-Werror=constant-logical-operand]
drivers/gpu/drm/i915/i915_config.c:13:43: error: use of logical '&&' with
constant operand '10000' [-Werror=constant-logical-operand]
drivers/gpu/drm/i915/gem/i915_gem_context.c:999:45: error: use of logical
'&&' with constant operand '20000' [-Werror=constant-logical-operand]
clang has the same warning, but it checks only a constant right operand
outside a macro. Here each constant is a left operand, and
IS_POWER_OF_2() is also a macro.
Commit 1a839e016e49 ("drm/i915: remove IS_ACTIVE") moved
CONFIG_DRM_I915_FENCE_TIMEOUT to the left of && to avoid the clang
warning. That does not help with GCC 17.
Compare each constant against 0, as commit aeedd3a82678 ("drm/i915: Avoid
-Wconstant-logical-operand in nsecs_to_jiffies_timeout()") did.
Signed-off-by: Vineet Gupta <[email protected]>
---
drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +-
drivers/gpu/drm/i915/i915_config.c | 2 +-
include/drm/intel/reg_bits.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c
b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index c58ffa5a8fa6..1639639dd290 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -996,7 +996,7 @@ static int intel_context_set_gem(struct intel_context *ce,
intel_engine_has_semaphores(ce->engine))
__set_bit(CONTEXT_USE_SEMAPHORES, &ce->flags);
- if (CONFIG_DRM_I915_REQUEST_TIMEOUT &&
+ if (CONFIG_DRM_I915_REQUEST_TIMEOUT != 0 &&
ctx->i915->params.request_timeout_ms) {
unsigned int timeout_ms = ctx->i915->params.request_timeout_ms;
diff --git a/drivers/gpu/drm/i915/i915_config.c
b/drivers/gpu/drm/i915/i915_config.c
index 9e13b1be407c..9bbebe0a6a70 100644
--- a/drivers/gpu/drm/i915/i915_config.c
+++ b/drivers/gpu/drm/i915/i915_config.c
@@ -10,7 +10,7 @@
unsigned long i915_fence_context_timeout(u64 context)
{
- if (CONFIG_DRM_I915_FENCE_TIMEOUT && context)
+ if (CONFIG_DRM_I915_FENCE_TIMEOUT != 0 && context)
return msecs_to_jiffies_timeout(CONFIG_DRM_I915_FENCE_TIMEOUT);
return 0;
diff --git a/include/drm/intel/reg_bits.h b/include/drm/intel/reg_bits.h
index 2a9066e1d808..f913c3e61f39 100644
--- a/include/drm/intel/reg_bits.h
+++ b/include/drm/intel/reg_bits.h
@@ -24,7 +24,7 @@
/*
* Local integer constant expression version of is_power_of_2().
*/
-#define IS_POWER_OF_2(__x) ((__x) && (((__x) & ((__x) - 1)) == 0))
+#define IS_POWER_OF_2(__x) ((__x) != 0 && (((__x) & ((__x) - 1))
== 0))
/**
* REG_FIELD_PREP8() - Prepare a u8 bitfield value
--
2.53.0-Meta
