Commit 1cbbec17 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-04-30' of... 

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: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/87selquhpe.fsf@intel.com
parents 5236bb81 7e21ea81

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

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ int intel_pxp_gsccs_init(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);

bool intel_pxp_gsccs_is_ready_for_sessions(struct intel_pxp *pxp);



#else

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) 
	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__ */