Commit 76b1dda1 authored Aug 29, 2024 by Andy Shevchenko Committed by Greg Kroah-Hartman Sep 12, 2024

drm/i915/fence: Mark debug_fence_free() with __maybe_unused



[ Upstream commit f99999536128b14b5d765a9982763b5134efdd79 ]

When debug_fence_free() is unused
(CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n), it prevents kernel builds
with clang, `make W=1` and CONFIG_WERROR=y:

.../i915_sw_fence.c:118:20: error: unused function 'debug_fence_free' [-Werror,-Wunused-function]
  118 | static inline void debug_fence_free(struct i915_sw_fence *fence)
      |                    ^~~~~~~~~~~~~~~~

Fix this by marking debug_fence_free() with __maybe_unused.

See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static
inline functions for W=1 build").

Fixes: fc158405 ("drm/i915: Integrate i915_sw_fence with debugobjects")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240829155950.1141978-3-andriy.shevchenko@linux.intel.com


Signed-off-by: Jani Nikula <jani.nikula@intel.com>
(cherry picked from commit 8be4dce5ea6f2368cc25edc71989c4690fa66964)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 60e02cb6

drivers/gpu/drm/i915/i915_sw_fence.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,7 @@ static inline void debug_fence_destroy(struct i915_sw_fence *fence)
	debug_object_destroy(fence, &i915_sw_fence_debug_descr);		debug_object_destroy(fence, &i915_sw_fence_debug_descr);
	}		}

	static inline void debug_fence_free(struct i915_sw_fence *fence)		static inline __maybe_unused void debug_fence_free(struct i915_sw_fence *fence)
	{		{
	debug_object_free(fence, &i915_sw_fence_debug_descr);		debug_object_free(fence, &i915_sw_fence_debug_descr);
	smp_wmb(); /* flush the change in state before reallocation */		smp_wmb(); /* flush the change in state before reallocation */
	@@ -105,7 +105,7 @@ static inline void debug_fence_destroy(struct i915_sw_fence *fence)
	{		{
	}		}

	static inline void debug_fence_free(struct i915_sw_fence *fence)		static inline __maybe_unused void debug_fence_free(struct i915_sw_fence *fence)
	{		{
	}		}