Revision 85b144f860176ec18db927d6d9ecdfb24d9c6483 authored by Maarten Lankhorst on 29 November 2012, 11:36:54 UTC, committed by Dave Airlie on 10 December 2012, 10:21:03 UTC
By removing the unlocking of lru and retaking it immediately, a race is
removed where the bo is taken off the swap list or the lru list between
the unlock and relock. As such the cleanup_refs code can be simplified,
it will attempt to call ttm_bo_wait non-blockingly, and if it fails
it will drop the locks and perform a blocking wait, or return an error
if no_wait_gpu was set.

The need for looping is also eliminated, since swapout and evict_mem_first
will always follow the destruction path, no new fence is allowed
to be attached. As far as I can see this may already have been the case,
but the unlocking / relocking required a complicated loop to deal with
re-reservation.

Changes since v1:
 - Simplify no_wait_gpu case by folding it in with empty ddestroy.
 - Hold a reservation while calling ttm_bo_cleanup_memtype_use again.
Changes since v2:
 - Do not remove bo from lru list while waiting

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent 6ed9ccb
History
File Mode Size
oss
seq
Kconfig -rw-r--r-- 6.0 KB
Makefile -rw-r--r-- 1.1 KB
compress_offload.c -rw-r--r-- 20.9 KB
control.c -rw-r--r-- 44.2 KB
control_compat.c -rw-r--r-- 11.5 KB
ctljack.c -rw-r--r-- 1.5 KB
device.c -rw-r--r-- 6.6 KB
hrtimer.c -rw-r--r-- 4.1 KB
hwdep.c -rw-r--r-- 13.4 KB
hwdep_compat.c -rw-r--r-- 2.3 KB
info.c -rw-r--r-- 22.9 KB
info_oss.c -rw-r--r-- 3.8 KB
init.c -rw-r--r-- 24.9 KB
isadma.c -rw-r--r-- 3.0 KB
jack.c -rw-r--r-- 6.2 KB
memalloc.c -rw-r--r-- 13.4 KB
memory.c -rw-r--r-- 2.5 KB
misc.c -rw-r--r-- 3.9 KB
pcm.c -rw-r--r-- 33.8 KB
pcm_compat.c -rw-r--r-- 15.0 KB
pcm_lib.c -rw-r--r-- 67.8 KB
pcm_memory.c -rw-r--r-- 13.7 KB
pcm_misc.c -rw-r--r-- 13.0 KB
pcm_native.c -rw-r--r-- 94.5 KB
pcm_timer.c -rw-r--r-- 3.7 KB
rawmidi.c -rw-r--r-- 47.8 KB
rawmidi_compat.c -rw-r--r-- 3.5 KB
rtctimer.c -rw-r--r-- 4.1 KB
sgbuf.c -rw-r--r-- 4.2 KB
sound.c -rw-r--r-- 12.0 KB
sound_oss.c -rw-r--r-- 7.6 KB
timer.c -rw-r--r-- 50.8 KB
timer_compat.c -rw-r--r-- 3.5 KB
vmaster.c -rw-r--r-- 12.1 KB

back to top