]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915: fix non-Ironlake 965 class crashes
authorJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 23 Apr 2010 16:32:23 +0000 (09:32 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 26 May 2010 21:32:06 +0000 (14:32 -0700)
commitd53662168530910feb44e0058b10e9b4ec2302be
treed935153c674a98fea0c385251d35e8c9bc053707
parent1d26fe28e13ed261cace13638536d17982d2d1cd
drm/i915: fix non-Ironlake 965 class crashes

commit 1918ad77f7f908ed67cf37c505c6ad4ac52f1ecf upstream.

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: Zdenek Kabelac <zdenek.kabelac@gmail.com>
Reported-by: Toralf Förster <toralf.foerster@gmx.de>
Tested-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/i915/i915_gem.c