Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7beae44d authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/guc: Unify naming of private GuC action functions 



We should avoid using guc_log prefix for functions that don't
operate on GuC log, but rather request action from the GuC.
Better to use guc_action prefix.

v2: rebase + naming compromise
v3: rebase

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180320181419.35576-1-michal.wajdeczko@intel.com
parent fa265275

drivers/gpu/drm/i915/intel_guc_log.c

+9 −9
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void guc_log_capture_logs(struct intel_guc_log *log); 
 * registers value.

 */



static int guc_log_flush_complete(struct intel_guc *guc)

static int guc_action_flush_log_complete(struct intel_guc *guc)

{

	u32 action[] = {

		INTEL_GUC_ACTION_LOG_BUFFER_FILE_FLUSH_COMPLETE
@@ -47,7 +47,7 @@ static int guc_log_flush_complete(struct intel_guc *guc) 
	return intel_guc_send(guc, action, ARRAY_SIZE(action));

}



static int guc_log_flush(struct intel_guc *guc)

static int guc_action_flush_log(struct intel_guc *guc)

{

	u32 action[] = {

		INTEL_GUC_ACTION_FORCE_LOG_BUFFER_FLUSH,
@@ -57,7 +57,7 @@ static int guc_log_flush(struct intel_guc *guc) 
	return intel_guc_send(guc, action, ARRAY_SIZE(action));

}



static int guc_log_control(struct intel_guc *guc, bool enable,

static int guc_action_control_log(struct intel_guc *guc, bool enable,

				  bool default_logging, u32 verbosity)

{

	union guc_log_control control_val = {
@@ -449,7 +449,7 @@ static void guc_log_capture_logs(struct intel_guc_log *log) 
	 * time, so get/put should be really quick.

	 */

	intel_runtime_pm_get(dev_priv);

	guc_log_flush_complete(guc);

	guc_action_flush_log_complete(guc);

	intel_runtime_pm_put(dev_priv);

}
@@ -526,7 +526,7 @@ int intel_guc_log_level_set(struct intel_guc_log *log, u64 val) 
	}



	intel_runtime_pm_get(dev_priv);

	ret = guc_log_control(guc, GUC_LOG_LEVEL_IS_VERBOSE(val),

	ret = guc_action_control_log(guc, GUC_LOG_LEVEL_IS_VERBOSE(val),

				     GUC_LOG_LEVEL_IS_ENABLED(val),

				     GUC_LOG_LEVEL_TO_VERBOSITY(val));

	intel_runtime_pm_put(dev_priv);
@@ -610,7 +610,7 @@ void intel_guc_log_relay_flush(struct intel_guc_log *log) 
	flush_work(&log->relay.flush_work);



	intel_runtime_pm_get(i915);

	guc_log_flush(guc);

	guc_action_flush_log(guc);

	intel_runtime_pm_put(i915);



	/* GuC would have updated log buffer by now, so capture it */