drm/i915: relative_constants_mode race fix
authorBen Widawsky <ben@bwidawsk.net>
Tue, 13 Dec 2011 03:21:57 +0000 (19:21 -0800)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 11 May 2012 12:14:38 +0000 (13:14 +0100)
commit4829cd25743cd337e484b8cd69e3f434c577f0cb
tree1473bc967c1f378c440f1bdd4d73bd45d53ac18f
parent4174dcc99576772d477a0686f84658e38c0c69d3
drm/i915: relative_constants_mode race fix

commit e2971bdab2b761683353da383c0fd5ac704d1cca upstream.

dev_priv keeps track of the current addressing mode that gets set at
execbuffer time. Unfortunately the existing code was doing this before
acquiring struct_mutex which leaves a race with another thread also
doing an execbuffer. If that wasn't bad enough, relocate_slow drops
struct_mutex which opens a much more likely error where another thread
comes in and modifies the state while relocate_slow is being slow.

The solution here is to just defer setting this state until we
absolutely need it, and we know we'll have struct_mutex for the
remainder of our code path.

v2: Keith noticed a bug in the original patch.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/i915/i915_gem_execbuffer.c