Commit 50aa253d authored by Keith Packard's avatar Keith Packard Committed by Dave Airlie

i915: Fix up ring initialization to cover G45 oddities

G45 appears quite sensitive to ring initialization register writes,
sometimes leaving the HEAD register with the START register contents. Check
to make sure HEAD is reset correctly when START is written, and fix it up,
screaming loudly.
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0cdad7e8
...@@ -2350,6 +2350,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev) ...@@ -2350,6 +2350,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
struct drm_gem_object *obj; struct drm_gem_object *obj;
struct drm_i915_gem_object *obj_priv; struct drm_i915_gem_object *obj_priv;
int ret; int ret;
u32 head;
ret = i915_gem_init_hws(dev); ret = i915_gem_init_hws(dev);
if (ret != 0) if (ret != 0)
...@@ -2390,17 +2391,49 @@ i915_gem_init_ringbuffer(struct drm_device *dev) ...@@ -2390,17 +2391,49 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
/* Stop the ring if it's running. */ /* Stop the ring if it's running. */
I915_WRITE(PRB0_CTL, 0); I915_WRITE(PRB0_CTL, 0);
I915_WRITE(PRB0_HEAD, 0);
I915_WRITE(PRB0_TAIL, 0); I915_WRITE(PRB0_TAIL, 0);
I915_WRITE(PRB0_START, 0); I915_WRITE(PRB0_HEAD, 0);
/* Initialize the ring. */ /* Initialize the ring. */
I915_WRITE(PRB0_START, obj_priv->gtt_offset); I915_WRITE(PRB0_START, obj_priv->gtt_offset);
head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
/* G45 ring initialization fails to reset head to zero */
if (head != 0) {
DRM_ERROR("Ring head not reset to zero "
"ctl %08x head %08x tail %08x start %08x\n",
I915_READ(PRB0_CTL),
I915_READ(PRB0_HEAD),
I915_READ(PRB0_TAIL),
I915_READ(PRB0_START));
I915_WRITE(PRB0_HEAD, 0);
DRM_ERROR("Ring head forced to zero "
"ctl %08x head %08x tail %08x start %08x\n",
I915_READ(PRB0_CTL),
I915_READ(PRB0_HEAD),
I915_READ(PRB0_TAIL),
I915_READ(PRB0_START));
}
I915_WRITE(PRB0_CTL, I915_WRITE(PRB0_CTL,
((obj->size - 4096) & RING_NR_PAGES) | ((obj->size - 4096) & RING_NR_PAGES) |
RING_NO_REPORT | RING_NO_REPORT |
RING_VALID); RING_VALID);
head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
/* If the head is still not zero, the ring is dead */
if (head != 0) {
DRM_ERROR("Ring initialization failed "
"ctl %08x head %08x tail %08x start %08x\n",
I915_READ(PRB0_CTL),
I915_READ(PRB0_HEAD),
I915_READ(PRB0_TAIL),
I915_READ(PRB0_START));
return -EIO;
}
/* Update our cache of the ring state */ /* Update our cache of the ring state */
i915_kernel_lost_context(dev); i915_kernel_lost_context(dev);
......
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