Commit 48e48a0b authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

drm/i915: Include a little more information about why ring init fails

If we include the expected values for the failing ring register checks,
it makes it marginally easier to see which is the culprit.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarOscar Mateo <oscar.mateo@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 074c6ada
...@@ -523,12 +523,11 @@ static int init_ring_common(struct intel_ring_buffer *ring) ...@@ -523,12 +523,11 @@ static int init_ring_common(struct intel_ring_buffer *ring)
I915_READ_START(ring) == i915_gem_obj_ggtt_offset(obj) && I915_READ_START(ring) == i915_gem_obj_ggtt_offset(obj) &&
(I915_READ_HEAD(ring) & HEAD_ADDR) == 0, 50)) { (I915_READ_HEAD(ring) & HEAD_ADDR) == 0, 50)) {
DRM_ERROR("%s initialization failed " DRM_ERROR("%s initialization failed "
"ctl %08x head %08x tail %08x start %08x\n", "ctl %08x (valid? %d) head %08x tail %08x start %08x [expected %08lx]\n",
ring->name, ring->name,
I915_READ_CTL(ring), I915_READ_CTL(ring), I915_READ_CTL(ring) & RING_VALID,
I915_READ_HEAD(ring), I915_READ_HEAD(ring), I915_READ_TAIL(ring),
I915_READ_TAIL(ring), I915_READ_START(ring), (unsigned long)i915_gem_obj_ggtt_offset(obj));
I915_READ_START(ring));
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment