Commit 87a0694e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wen Zhiwei
Browse files

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

stable inclusion
from stable-v6.6.51
commit 60d54a45dbbbac8af9f3352042bd30b527995aef
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYRVR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=60d54a45dbbbac8af9f3352042bd30b527995aef



--------------------------------

[ 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 6863f564 ("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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240829155950.1141978-3-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
(cherry picked from commit 8be4dce5ea6f2368cc25edc71989c4690fa66964)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 6da7f8eb

drivers/gpu/drm/i915/i915_sw_fence.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static inline void debug_fence_destroy(struct i915_sw_fence *fence) 
	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);

	smp_wmb(); /* flush the change in state before reallocation */
@@ -115,7 +115,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)

{

}