Commit 28bef5bc authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter
Browse files

drm/i915/guc: Remove sample_forcewake h2g action 



This action is no-op in the GuC side for a few versions already
and it is getting entirely removed soon, in an upcoming version.

Time to remove before we face communication issues.

Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Acked-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210603051630.2635-5-matthew.brost@intel.com
parent 8bb9fbc1

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

+0 −16
Original line number Diff line number Diff line
@@ -469,22 +469,6 @@ int intel_guc_to_host_process_recv_msg(struct intel_guc *guc, 
	return 0;

}



int intel_guc_sample_forcewake(struct intel_guc *guc)

{

	struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;

	u32 action[2];



	action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;

	/* WaRsDisableCoarsePowerGating:skl,cnl */

	if (!HAS_RC6(dev_priv) || NEEDS_WaRsDisableCoarsePowerGating(dev_priv))

		action[1] = 0;

	else

		/* bit 0 and 1 are for Render and Media domain separately */

		action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA;



	return intel_guc_send(guc, action, ARRAY_SIZE(action));

}



/**

 * intel_guc_auth_huc() - Send action to GuC to authenticate HuC ucode

 * @guc: intel_guc structure

drivers/gpu/drm/i915/gt/uc/intel_guc.h

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, 
			u32 *response_buf, u32 response_buf_size);

int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,

				       const u32 *payload, u32 len);

int intel_guc_sample_forcewake(struct intel_guc *guc);

int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);

int intel_guc_suspend(struct intel_guc *guc);

int intel_guc_resume(struct intel_guc *guc);

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h

+0 −4
Original line number Diff line number Diff line
@@ -302,9 +302,6 @@ struct guc_ct_buffer_desc { 
#define GUC_CT_MSG_ACTION_SHIFT			16

#define GUC_CT_MSG_ACTION_MASK			0xFFFF



#define GUC_FORCEWAKE_RENDER	(1 << 0)

#define GUC_FORCEWAKE_MEDIA	(1 << 1)



#define GUC_POWER_UNSPECIFIED	0

#define GUC_POWER_D0		1

#define GUC_POWER_D1		2
@@ -558,7 +555,6 @@ enum intel_guc_action { 
	INTEL_GUC_ACTION_ENTER_S_STATE = 0x501,

	INTEL_GUC_ACTION_EXIT_S_STATE = 0x502,

	INTEL_GUC_ACTION_SLPC_REQUEST = 0x3003,

	INTEL_GUC_ACTION_SAMPLE_FORCEWAKE = 0x3005,

	INTEL_GUC_ACTION_AUTHENTICATE_HUC = 0x4000,

	INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER = 0x4505,

	INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER = 0x4506,

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

+0 −4
Original line number Diff line number Diff line
@@ -502,10 +502,6 @@ static int __uc_init_hw(struct intel_uc *uc) 


	intel_huc_auth(huc);



	ret = intel_guc_sample_forcewake(guc);

	if (ret)

		goto err_log_capture;



	if (intel_uc_uses_guc_submission(uc))

		intel_guc_submission_enable(guc);