Commit 1918ad77 authored by Jesse Barnes's avatar Jesse Barnes Committed by Linus Torvalds

drm/i915: fix non-Ironlake 965 class crashes

My PIPE_CONTROL fix (just sent via Eric's tree) was buggy; I was
testing a whole set of patches together and missed a conversion to the
new HAS_PIPE_CONTROL macro, which will cause breakage on non-Ironlake
965 class chips.  Fortunately, the fix is trivial and has been tested.

Be sure to use the HAS_PIPE_CONTROL macro in i915_get_gem_seqno, or
we'll end up reading the wrong graphics memory, likely causing hangs,
crashes, or worse.
Reported-by: default avatarZdenek Kabelac <>
Reported-by: default avatarToralf Förster <>
Tested-by: default avatarToralf Förster <>
Signed-off-by: default avatarJesse Barnes <>
Signed-off-by: default avatarLinus Torvalds <>
parent d5a30458
......@@ -1793,7 +1793,7 @@ i915_get_gem_seqno(struct drm_device *dev)
drm_i915_private_t *dev_priv = dev->dev_private;
if (IS_I965G(dev))
return ((volatile u32 *)(dev_priv->seqno_page))[0];
return READ_HWSP(dev_priv, I915_GEM_HWS_INDEX);
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