Commit 6da7f8eb authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wen Zhiwei
Browse files

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

stable inclusion
from stable-v6.6.51
commit a65ebba8733727ffd9d0de78899ea6ef1791ebc7
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=a65ebba8733727ffd9d0de78899ea6ef1791ebc7



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

[ Upstream commit fcd9e8afd546f6ced378d078345a89bf346d065e ]

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

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

Fix this by marking debug_fence_init_onstack() with __maybe_unused.

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

Fixes: 214707fc ("drm/i915/selftests: Wrap a timer into a i915_sw_fence")
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-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
(cherry picked from commit 5bf472058ffb43baf6a4cdfe1d7f58c4c194c688)
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 387ef2a1

drivers/gpu/drm/i915/i915_sw_fence.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static inline void debug_fence_init(struct i915_sw_fence *fence) 
	debug_object_init(fence, &i915_sw_fence_debug_descr);

}



static inline void debug_fence_init_onstack(struct i915_sw_fence *fence)

static inline __maybe_unused void debug_fence_init_onstack(struct i915_sw_fence *fence)

{

	debug_object_init_on_stack(fence, &i915_sw_fence_debug_descr);

}
@@ -94,7 +94,7 @@ static inline void debug_fence_init(struct i915_sw_fence *fence) 
{

}



static inline void debug_fence_init_onstack(struct i915_sw_fence *fence)

static inline __maybe_unused void debug_fence_init_onstack(struct i915_sw_fence *fence)

{

}