Commit 21f77351 authored by Alan Previn's avatar Alan Previn Committed by Tvrtko Ursulin
Browse files

drm/i915/gsc: take a wakeref for the proxy-init-completion check 

Ensure intel_gsc_uc_fw_init_done and intel_gsc_uc_fw_proxy_init
takes a wakeref before reading GSC Shim registers.

NOTE: another patch in review also adds a call from selftest to
this same function. (https://patchwork.freedesktop.org/series/117713/

)
which is why i am adding the wakeref inside the callee, not the
caller.

v2: - add a helper, 'gsc_uc_get_fw_status' for both callers
      (Daniele Ceraolo)

Fixes: 99afb7cc ("drm/i915/pxp: Add ARB session creation and cleanup")
Signed-off-by: default avatarAlan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230608230716.3079594-1-alan.previn.teres.alexis@intel.com


(cherry picked from commit 8c33c375)
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 2222dcb0

drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c

+14 −8
Original line number Diff line number Diff line
@@ -24,21 +24,27 @@ static bool gsc_is_in_reset(struct intel_uncore *uncore) 
	       GSC_FW_CURRENT_STATE_RESET;

}



bool intel_gsc_uc_fw_proxy_init_done(struct intel_gsc_uc *gsc)

static u32 gsc_uc_get_fw_status(struct intel_uncore *uncore)

{

	struct intel_uncore *uncore = gsc_uc_to_gt(gsc)->uncore;

	u32 fw_status = intel_uncore_read(uncore, GSC_FW_STATUS_REG);

	intel_wakeref_t wakeref;

	u32 fw_status = 0;



	return REG_FIELD_GET(GSC_FW_CURRENT_STATE, fw_status) ==

	with_intel_runtime_pm(uncore->rpm, wakeref)

		fw_status = intel_uncore_read(uncore, GSC_FW_STATUS_REG);



	return fw_status;

}



bool intel_gsc_uc_fw_proxy_init_done(struct intel_gsc_uc *gsc)

{

	return REG_FIELD_GET(GSC_FW_CURRENT_STATE,

			     gsc_uc_get_fw_status(gsc_uc_to_gt(gsc)->uncore)) ==

	       GSC_FW_PROXY_STATE_NORMAL;

}



bool intel_gsc_uc_fw_init_done(struct intel_gsc_uc *gsc)

{

	struct intel_uncore *uncore = gsc_uc_to_gt(gsc)->uncore;

	u32 fw_status = intel_uncore_read(uncore, GSC_FW_STATUS_REG);



	return fw_status & GSC_FW_INIT_COMPLETE_BIT;

	return gsc_uc_get_fw_status(gsc_uc_to_gt(gsc)->uncore) & GSC_FW_INIT_COMPLETE_BIT;

}



static int emit_gsc_fw_load(struct i915_request *rq, struct intel_gsc_uc *gsc)