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
mpu401
opl3
opl4
pcsp
vx
Kconfig -rw-r--r-- 6.8 KB
Makefile -rw-r--r-- 788 bytes
aloop.c -rw-r--r-- 35.5 KB
dummy.c -rw-r--r-- 30.4 KB
ml403-ac97cr.c -rw-r--r-- 39.9 KB
mtpav.c -rw-r--r-- 20.1 KB
mts64.c -rw-r--r-- 26.8 KB
pcm-indirect2.c -rw-r--r-- 16.8 KB
pcm-indirect2.h -rw-r--r-- 5.1 KB
portman2x4.c -rw-r--r-- 25.3 KB
serial-u16550.c -rw-r--r-- 31.0 KB
virmidi.c -rw-r--r-- 5.6 KB

back to top