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

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index e2085820b586..f93e4532371a 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -453,13 +453,13 @@ static int init_ring_common(struct intel_engine_cs *engine)
 
         if (!stop_ring(engine)) {
                 /* G45 ring initialization often fails to reset head to zero */
-                DRM_DEBUG_KMS("%s head not reset to zero "
-                              "ctl %08x head %08x tail %08x start %08x\n",
-                              engine->name,
-                              I915_READ_CTL(engine),
-                              I915_READ_HEAD(engine),
-                              I915_READ_TAIL(engine),
-                              I915_READ_START(engine));
+                DRM_DEBUG_DRIVER("%s head not reset to zero "
+                                "ctl %08x head %08x tail %08x start %08x\n",
+                                engine->name,
+                                I915_READ_CTL(engine),
+                                I915_READ_HEAD(engine),
+                                I915_READ_TAIL(engine),
+                                I915_READ_START(engine));
 
                 if (!stop_ring(engine)) {
                         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 */
         if (I915_READ_HEAD(engine))
-                DRM_DEBUG("%s initialization failed [head=%08x], fudging\n",
-                          engine->name, I915_READ_HEAD(engine));
+                DRM_DEBUG_DRIVER("%s initialization failed [head=%08x], fudging\n",
+                                 engine->name, I915_READ_HEAD(engine));
 
         intel_ring_update_space(ring);
         I915_WRITE_HEAD(engine, ring->head);