Commit 6fd0d56e authored by Chris Wilson's avatar Chris Wilson

drm/i915/ringbuffer: Only print an error on the second attempt to reset head

There's not much we can do here but hope for the best. However the first
failure happens quite frequently and if often remedied by the second
attempt to reset HEAD. So only print the error if that attempt also
fails.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=19802Reported-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
parent bbf0c6b3
...@@ -156,23 +156,25 @@ static int init_ring_common(struct drm_device *dev, ...@@ -156,23 +156,25 @@ static int init_ring_common(struct drm_device *dev,
/* G45 ring initialization fails to reset head to zero */ /* G45 ring initialization fails to reset head to zero */
if (head != 0) { if (head != 0) {
DRM_ERROR("%s head not reset to zero " DRM_DEBUG_KMS("%s head not reset to zero "
"ctl %08x head %08x tail %08x start %08x\n", "ctl %08x head %08x tail %08x start %08x\n",
ring->name, ring->name,
I915_READ_CTL(ring), I915_READ_CTL(ring),
I915_READ_HEAD(ring), I915_READ_HEAD(ring),
I915_READ_TAIL(ring), I915_READ_TAIL(ring),
I915_READ_START(ring)); I915_READ_START(ring));
I915_WRITE_HEAD(ring, 0); I915_WRITE_HEAD(ring, 0);
DRM_ERROR("%s head forced to zero " if (I915_READ_HEAD(ring) & HEAD_ADDR) {
"ctl %08x head %08x tail %08x start %08x\n", DRM_ERROR("failed to set %s head to zero "
ring->name, "ctl %08x head %08x tail %08x start %08x\n",
I915_READ_CTL(ring), ring->name,
I915_READ_HEAD(ring), I915_READ_CTL(ring),
I915_READ_TAIL(ring), I915_READ_HEAD(ring),
I915_READ_START(ring)); I915_READ_TAIL(ring),
I915_READ_START(ring));
}
} }
I915_WRITE_CTL(ring, I915_WRITE_CTL(ring,
......
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