From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D1C68C3ABBF for ; Tue, 6 May 2025 12:49:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 66F2410E088; Tue, 6 May 2025 12:49:02 +0000 (UTC) X-Greylist: delayed 397 seconds by postgrey-1.36 at gabe; Tue, 06 May 2025 12:49:00 UTC Received: from lechuck.jsg.id.au (jsg.id.au [193.114.144.202]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95F2110E686; Tue, 6 May 2025 12:49:00 +0000 (UTC) Received: from largo.jsg.id.au (largo.jsg.id.au [192.168.1.44]) by lechuck.jsg.id.au (OpenSMTPD) with ESMTPS id d7ae1c5c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 6 May 2025 22:42:18 +1000 (AEST) Received: from localhost (largo.jsg.id.au [local]) by largo.jsg.id.au (OpenSMTPD) with ESMTPA id f8bfef88; Tue, 6 May 2025 22:42:18 +1000 (AEST) Date: Tue, 6 May 2025 22:42:18 +1000 From: Jonathan Gray To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm/i915/pxp: fix non-optimised !CONFIG_DRM_I915_PXP build Message-ID: References: <20241103110230.11035-1-jsg@jsg.id.au> <87msieghk7.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87msieghk7.fsf@intel.com> X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Nov 05, 2024 at 11:23:36AM +0200, Jani Nikula wrote: > On Sun, 03 Nov 2024, Jonathan Gray wrote: > > intel_pxp_gsccs_is_ready_for_sessions() is gated by CONFIG_DRM_I915_PXP > > but called from intel_pxp.c which isn't. Provide a fallback inline > > function to fix the non-optimised build. > > > > Fixes: 99afb7cc8c44 ("drm/i915/pxp: Add ARB session creation and cleanup") > > Signed-off-by: Jonathan Gray > > Reviewed-by: Jani Nikula equivalent patch was merged and now queued for stable 7e21ea8149a0 ("drm/i915/pxp: fix undefined reference to `intel_pxp_gsccs_is_ready_for_sessions'") > > > --- > > drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h > > index 9aae779c4da3..b93488e99685 100644 > > --- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h > > +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h > > @@ -16,26 +16,30 @@ struct intel_pxp; > > #define GSC_PENDING_RETRY_PAUSE_MS 50 > > #define GSCFW_MAX_ROUND_TRIP_LATENCY_MS (GSC_HECI_REPLY_LATENCY_MS + \ > > (GSC_PENDING_RETRY_MAXCOUNT * GSC_PENDING_RETRY_PAUSE_MS)) > > > > #ifdef CONFIG_DRM_I915_PXP > > void intel_pxp_gsccs_fini(struct intel_pxp *pxp); > > int intel_pxp_gsccs_init(struct intel_pxp *pxp); > > +bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp); > > > > int intel_pxp_gsccs_create_session(struct intel_pxp *pxp, int arb_session_id); > > void intel_pxp_gsccs_end_arb_fw_session(struct intel_pxp *pxp, u32 arb_session_id); > > > > #else > > static inline void intel_pxp_gsccs_fini(struct intel_pxp *pxp) > > { > > } > > > > static inline int intel_pxp_gsccs_init(struct intel_pxp *pxp) > > { > > return 0; > > } > > > > -#endif > > +static inline bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp) > > +{ > > + return false; > > +} > > > > -bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp); > > +#endif > > > > #endif /*__INTEL_PXP_GSCCS_H__ */ > > -- > Jani Nikula, Intel >