p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171030185616.32836-2-michel.thierry@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Michel Thierry 2017-10-30 11:56:14 -07:00 committed by Chris Wilson
parent 6d5646006f
commit cb20a3c056
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_drv.h
View File

@ -3324,7 +3324,7 @@ extern int i915_reset_engine(struct intel_engine_cs *engine,
unsigned int flags); unsigned int flags);
extern bool intel_has_reset_engine(struct drm_i915_private *dev_priv); 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_engine_init_hangcheck(struct intel_engine_cs *engine);
extern void intel_hangcheck_init(struct drm_i915_private *dev_priv); extern void intel_hangcheck_init(struct drm_i915_private *dev_priv);
extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv); extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);

4
drivers/gpu/drm/i915/intel_uc.c
View File

@ -33,9 +33,9 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)
int ret; int ret;
u32 guc_status; u32 guc_status;
ret = intel_guc_reset(dev_priv); ret = intel_reset_guc(dev_priv);
if (ret) { if (ret) {
DRM_ERROR("GuC reset failed, ret = %d\n", ret); DRM_ERROR("Failed to reset GuC, ret = %d\n", ret);
return ret; return ret;
} }

2
drivers/gpu/drm/i915/intel_uncore.c
View File

@ -1803,7 +1803,7 @@ bool intel_has_reset_engine(struct drm_i915_private *dev_priv)
i915_modparams.reset >= 2); 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; int ret;