Skip to content

Commit 1cbbec1

Browse files
committed
Merge tag 'drm-intel-fixes-2025-04-30' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
drm/i915 fixes for v6.15-rc5: - Fix build for CONFIG_DRM_I915_PXP=n Signed-off-by: Dave Airlie <airlied@redhat.com> From: Jani Nikula <jani.nikula@intel.com> Link: https://lore.kernel.org/r/87selquhpe.fsf@intel.com
2 parents 5236bb8 + 7e21ea8 commit 1cbbec1

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ int intel_pxp_gsccs_init(struct intel_pxp *pxp);
2323

2424
int intel_pxp_gsccs_create_session(struct intel_pxp *pxp, int arb_session_id);
2525
void intel_pxp_gsccs_end_arb_fw_session(struct intel_pxp *pxp, u32 arb_session_id);
26+
bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp);
2627

2728
#else
2829
static inline void intel_pxp_gsccs_fini(struct intel_pxp *pxp)
@@ -34,8 +35,11 @@ static inline int intel_pxp_gsccs_init(struct intel_pxp *pxp)
3435
return 0;
3536
}
3637

37-
#endif
38+
static inline bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp)
39+
{
40+
return false;
41+
}
3842

39-
bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp);
43+
#endif
4044

4145
#endif /*__INTEL_PXP_GSCCS_H__ */

0 commit comments

Comments
 (0)