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
File | Mode | Size |
---|---|---|
oss | ||
Kconfig | -rw-r--r-- | 386 bytes |
Makefile | -rw-r--r-- | 1.2 KB |
seq.c | -rw-r--r-- | 4.0 KB |
seq_clientmgr.c | -rw-r--r-- | 65.8 KB |
seq_clientmgr.h | -rw-r--r-- | 2.9 KB |
seq_compat.c | -rw-r--r-- | 4.6 KB |
seq_device.c | -rw-r--r-- | 13.5 KB |
seq_dummy.c | -rw-r--r-- | 6.6 KB |
seq_fifo.c | -rw-r--r-- | 5.9 KB |
seq_fifo.h | -rw-r--r-- | 2.2 KB |
seq_info.c | -rw-r--r-- | 2.0 KB |
seq_info.h | -rw-r--r-- | 1.4 KB |
seq_lock.c | -rw-r--r-- | 1.5 KB |
seq_lock.h | -rw-r--r-- | 901 bytes |
seq_memory.c | -rw-r--r-- | 12.4 KB |
seq_memory.h | -rw-r--r-- | 3.2 KB |
seq_midi.c | -rw-r--r-- | 14.0 KB |
seq_midi_emul.c | -rw-r--r-- | 19.5 KB |
seq_midi_event.c | -rw-r--r-- | 15.4 KB |
seq_ports.c | -rw-r--r-- | 18.5 KB |
seq_ports.h | -rw-r--r-- | 4.9 KB |
seq_prioq.c | -rw-r--r-- | 10.7 KB |
seq_prioq.h | -rw-r--r-- | 2.0 KB |
seq_queue.c | -rw-r--r-- | 19.4 KB |
seq_queue.h | -rw-r--r-- | 4.4 KB |
seq_system.c | -rw-r--r-- | 5.3 KB |
seq_system.h | -rw-r--r-- | 2.0 KB |
seq_timer.c | -rw-r--r-- | 11.0 KB |
seq_timer.h | -rw-r--r-- | 4.6 KB |
seq_virmidi.c | -rw-r--r-- | 13.6 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...