]> bbs.cooldavid.org Git - net-next-2.6.git/commit
drm/intel: fix up set_tiling for untiled->tiled transition
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 18 Mar 2010 08:22:12 +0000 (09:22 +0100)
committerEric Anholt <eric@anholt.net>
Thu, 18 Mar 2010 23:48:02 +0000 (16:48 -0700)
commitfe305198d4bf481d6dd017df35c566c9d477fada
tree3ae7eadb669952be2ad89c26c59f4d749ee9e7f5
parent8956c8bba5b11b3d3aec000e6c6184943011a8d4
drm/intel: fix up set_tiling for untiled->tiled transition

Bug introduced in

commit 10ae9bd25acf394c8fa2f9d795dfa9cec4d19ed6
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Mon Feb 1 13:59:17 2010 +0100

    drm/i915: blow away userspace mappings before fence change

The problem is that when there's no fence reg assigned and the object
is mapped at a fenceable offset in the gtt, the userspace mappings won't
be torn down. Which happens on untiled->tiled transition quite often
on 4th gen and later because there fencing does not have any special
alignment constraints (as opposed to 2nd and 3rd gen on which I've tested
the original commit).

Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=26993
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Eric Anholt <eric@anholt.net> (fixes OpenArena)
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/i915_gem_tiling.c