Commit bae3fdce authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Tvrtko Ursulin
Browse files

drm/i915/guc: Make intel_guc_recv static. 



This function is only used by intel_guc_send() and it doesn't
need to be exposed outside of intel_uc.o file. Also when defined
as static, compiler will generate smaller code. Additionally let
it take guc param instead dev_priv to match function name.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161220115531.76120-1-michal.wajdeczko@intel.com
parent 1c74eeaf

drivers/gpu/drm/i915/intel_uc.c

+5 −3
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) 
 * Read GuC command/status register (SOFT_SCRATCH_0)

 * Return true if it contains a response rather than a command

 */

bool intel_guc_recv(struct drm_i915_private *dev_priv, u32 *status)

static bool intel_guc_recv(struct intel_guc *guc, u32 *status)

{

	struct drm_i915_private *dev_priv = guc_to_i915(guc);



	u32 val = I915_READ(SOFT_SCRATCH(0));

	*status = val;

	return INTEL_GUC_RECV_IS_RESPONSE(val);
@@ -69,9 +71,9 @@ int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len) 
	 * up to that length of time, then switch to a slower sleep-wait loop.

	 * No inte_guc_send command should ever take longer than 10ms.

	 */

	ret = wait_for_us(intel_guc_recv(dev_priv, &status), 10);

	ret = wait_for_us(intel_guc_recv(guc, &status), 10);

	if (ret)

		ret = wait_for(intel_guc_recv(dev_priv, &status), 10);

		ret = wait_for(intel_guc_recv(guc, &status), 10);

	if (status != INTEL_GUC_STATUS_SUCCESS) {

		/*

		 * Either the GuC explicitly returned an error (which

drivers/gpu/drm/i915/intel_uc.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ struct intel_guc { 


/* intel_uc.c */

void intel_uc_init_early(struct drm_i915_private *dev_priv);

bool intel_guc_recv(struct drm_i915_private *dev_priv, u32 *status);

int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);

int intel_guc_sample_forcewake(struct intel_guc *guc);

int intel_guc_log_flush_complete(struct intel_guc *guc);