Commit cb20a3c0 authored by Michel Thierry's avatar Michel Thierry Committed by Chris Wilson
Browse files

drm/i915/guc: Rename the function that resets the GuC 



intel_guc_reset sounds more like the microcontroller is the one performing
a reset, while in this case is the opposite. intel_reset_guc not only
makes it clearer, it follows the other intel_reset functions available.

v2: Print error message in English (Tvrtko).

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171030185616.32836-2-michel.thierry@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 6d564600

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -3324,7 +3324,7 @@ extern int i915_reset_engine(struct intel_engine_cs *engine, 
			     unsigned int flags);



extern bool intel_has_reset_engine(struct drm_i915_private *dev_priv);

extern int intel_guc_reset(struct drm_i915_private *dev_priv);

extern int intel_reset_guc(struct drm_i915_private *dev_priv);

extern void intel_engine_init_hangcheck(struct intel_engine_cs *engine);

extern void intel_hangcheck_init(struct drm_i915_private *dev_priv);

extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/intel_uc.c

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) 
	int ret;

	u32 guc_status;



	ret = intel_guc_reset(dev_priv);

	ret = intel_reset_guc(dev_priv);

	if (ret) {

		DRM_ERROR("GuC reset failed, ret = %d\n", ret);

		DRM_ERROR("Failed to reset GuC, ret = %d\n", ret);

		return ret;

	}

drivers/gpu/drm/i915/intel_uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -1803,7 +1803,7 @@ bool intel_has_reset_engine(struct drm_i915_private *dev_priv) 
		i915_modparams.reset >= 2);

}



int intel_guc_reset(struct drm_i915_private *dev_priv)

int intel_reset_guc(struct drm_i915_private *dev_priv)

{

	int ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE