From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B0A5198853; Tue, 10 Sep 2024 10:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725963239; cv=none; b=O4DoOk4LCiIsn2VgRoTe6tmtHFxl3obtHNkwZMK0Y+DBhQ3CrTu2aGHdHQdaBrsFGJdgE/4EamWZk4H3YjMf+hYG1TatTiA1ibpnJ87yVsLy1TJYdlv8ETgvCWjJdGdDvWwi0IiwRJ4zgFsPybWHp+eEag5XbMAOhnJrdl1sAvI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725963239; c=relaxed/simple; bh=FRmMt2O9DBjnD0XjEj2/1rBXHM65zd3ftpCorAyHYGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JwmNcOf3LlMBp/tqQNx61zLV3r/SvbdVGi6nX4/A9I1hwFK/Mo4FTbFibeVZfF4eUp+d0IoWcpbeMdmynwyZxbxAD4m4Rg5x1D6DZmL/bRh6kwVxoYrw+2j5Oo/DQAQFw75IKVY+USazWgyCHq4dxRoEQNvquPzT6arzAqjL/t8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BbiqZaA0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BbiqZaA0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C700FC4CEC3; Tue, 10 Sep 2024 10:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725963239; bh=FRmMt2O9DBjnD0XjEj2/1rBXHM65zd3ftpCorAyHYGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BbiqZaA0aiepdVqZxqe069smQXaW41T4+6fCGqRv3m0mXTP/miY92YeBcMEnG7WKx oDKW9DT/9I5Ifqlx++KBY95PgpoymWjh2njNopi/I1vigQYMBn8AIZk3DrCqkE6/vg 1E9nhUbSxddbCKaEgeXXSYVUIjXfRH7IWH/Fya30= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Jani Nikula , Joonas Lahtinen , Sasha Levin Subject: [PATCH 6.1 183/192] drm/i915/fence: Mark debug_fence_free() with __maybe_unused Date: Tue, 10 Sep 2024 11:33:27 +0200 Message-ID: <20240910092605.359540755@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092557.876094467@linuxfoundation.org> References: <20240910092557.876094467@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Shevchenko [ 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: fc1584059d6c ("drm/i915: Integrate i915_sw_fence with debugobjects") Signed-off-by: Andy Shevchenko Reviewed-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20240829155950.1141978-3-andriy.shevchenko@linux.intel.com Signed-off-by: Jani Nikula (cherry picked from commit 8be4dce5ea6f2368cc25edc71989c4690fa66964) Signed-off-by: Joonas Lahtinen Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/i915_sw_fence.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index c2ac1900d73e..e664f8e461e6 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -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) { } -- 2.43.0