UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Tidy up some error messages around reset failure 

On blb and pnv, we are seeing sporadic

  i915 0000:00:02.0: Resetting chip after gpu hang
  [drm:intel_gpu_reset [i915]] rcs0: timed out on STOP_RING
  [drm:i915_reset [i915]] *ERROR* Failed hw init on reset -5

which notably lack the actual root cause of the error. Ostensibly it
should be the init_ring_common() that failed, but it's error paths are
covered by DRM_ERROR.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180207111545.17078-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2018-02-07 11:15:45 +00:00
parent c22b355ff7
commit 8177e11252
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/i915_drv.c
View File

@ -1957,7 +1957,8 @@ void i915_reset(struct drm_i915_private *i915, unsigned int flags)
*/ */
ret = i915_ggtt_enable_hw(i915); ret = i915_ggtt_enable_hw(i915);
if (ret) { if (ret) {
DRM_ERROR("Failed to re-enable GGTT following reset %d\n", ret); DRM_ERROR("Failed to re-enable GGTT following reset (%d)\n",
ret);
goto error; goto error;
} }
@ -1974,7 +1975,8 @@ void i915_reset(struct drm_i915_private *i915, unsigned int flags)
*/ */
ret = i915_gem_init_hw(i915); ret = i915_gem_init_hw(i915);
if (ret) { if (ret) {
DRM_ERROR("Failed hw init on reset %d\n", ret); DRM_ERROR("Failed to initialise HW following reset (%d)\n",
ret);
goto error; goto error;
} }

11
drivers/gpu/drm/i915/i915_gem.c
View File

@ -5065,8 +5065,11 @@ static int __i915_gem_restart_engines(void *data)
for_each_engine(engine, i915, id) { for_each_engine(engine, i915, id) {
err = engine->init_hw(engine); err = engine->init_hw(engine);
if (err) if (err) {
DRM_ERROR("Failed to restart %s (%d)\n",
engine->name, err);
return err; return err;
}
} }
return 0; return 0;
@ -5118,14 +5121,16 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)
ret = i915_ppgtt_init_hw(dev_priv); ret = i915_ppgtt_init_hw(dev_priv);
if (ret) { if (ret) {
DRM_ERROR("PPGTT enable HW failed %d\n", ret); DRM_ERROR("Enabling PPGTT failed (%d)\n", ret);
goto out; goto out;
} }
/* We can't enable contexts until all firmware is loaded */ /* We can't enable contexts until all firmware is loaded */
ret = intel_uc_init_hw(dev_priv); ret = intel_uc_init_hw(dev_priv);
if (ret) if (ret) {
DRM_ERROR("Enabling uc failed (%d)\n", ret);
goto out; goto out;
}
intel_mocs_init_l3cc_table(dev_priv); intel_mocs_init_l3cc_table(dev_priv);

18
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -453,13 +453,13 @@ static int init_ring_common(struct intel_engine_cs *engine)
if (!stop_ring(engine)) { if (!stop_ring(engine)) {
/* G45 ring initialization often fails to reset head to zero */ /* G45 ring initialization often fails to reset head to zero */
DRM_DEBUG_KMS("%s head not reset to zero " DRM_DEBUG_DRIVER("%s head not reset to zero "
"ctl %08x head %08x tail %08x start %08x\n", "ctl %08x head %08x tail %08x start %08x\n",
engine->name, engine->name,
I915_READ_CTL(engine), I915_READ_CTL(engine),
I915_READ_HEAD(engine), I915_READ_HEAD(engine),
I915_READ_TAIL(engine), I915_READ_TAIL(engine),
I915_READ_START(engine)); I915_READ_START(engine));
if (!stop_ring(engine)) { if (!stop_ring(engine)) {
DRM_ERROR("failed to set %s head to zero " DRM_ERROR("failed to set %s head to zero "
@ -492,8 +492,8 @@ static int init_ring_common(struct intel_engine_cs *engine)
/* WaClearRingBufHeadRegAtInit:ctg,elk */ /* WaClearRingBufHeadRegAtInit:ctg,elk */
if (I915_READ_HEAD(engine)) if (I915_READ_HEAD(engine))
DRM_DEBUG("%s initialization failed [head=%08x], fudging\n", DRM_DEBUG_DRIVER("%s initialization failed [head=%08x], fudging\n",
engine->name, I915_READ_HEAD(engine)); engine->name, I915_READ_HEAD(engine));
intel_ring_update_space(ring); intel_ring_update_space(ring);
I915_WRITE_HEAD(engine, ring->head); I915_WRITE_HEAD(engine, ring->head);