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 |
---|---|---|
dmasound | ||
.gitignore | -rw-r--r-- | 47 bytes |
CHANGELOG | -rw-r--r-- | 13.4 KB |
Kconfig | -rw-r--r-- | 19.3 KB |
Makefile | -rw-r--r-- | 3.3 KB |
README.FIRST | -rw-r--r-- | 246 bytes |
ad1848.c | -rw-r--r-- | 74.2 KB |
ad1848.h | -rw-r--r-- | 982 bytes |
ad1848_mixer.h | -rw-r--r-- | 10.7 KB |
aedsp16.c | -rw-r--r-- | 35.6 KB |
audio.c | -rw-r--r-- | 25.0 KB |
bin2hex.c | -rw-r--r-- | 755 bytes |
coproc.h | -rw-r--r-- | 361 bytes |
dev_table.c | -rw-r--r-- | 5.5 KB |
dev_table.h | -rw-r--r-- | 10.6 KB |
dmabuf.c | -rw-r--r-- | 34.9 KB |
hex2hex.c | -rw-r--r-- | 1.9 KB |
kahlua.c | -rw-r--r-- | 5.0 KB |
midi_ctrl.h | -rw-r--r-- | 1.0 KB |
midi_synth.c | -rw-r--r-- | 14.8 KB |
midi_synth.h | -rw-r--r-- | 1.7 KB |
midibuf.c | -rw-r--r-- | 8.6 KB |
mpu401.c | -rw-r--r-- | 37.6 KB |
mpu401.h | -rw-r--r-- | 419 bytes |
msnd.c | -rw-r--r-- | 8.2 KB |
msnd.h | -rw-r--r-- | 7.2 KB |
msnd_classic.c | -rw-r--r-- | 122 bytes |
msnd_classic.h | -rw-r--r-- | 5.3 KB |
msnd_pinnacle.c | -rw-r--r-- | 47.4 KB |
msnd_pinnacle.h | -rw-r--r-- | 7.4 KB |
opl3.c | -rw-r--r-- | 27.1 KB |
opl3_hw.h | -rw-r--r-- | 6.9 KB |
os.h | -rw-r--r-- | 942 bytes |
pas2.h | -rw-r--r-- | 428 bytes |
pas2_card.c | -rw-r--r-- | 9.3 KB |
pas2_midi.c | -rw-r--r-- | 4.9 KB |
pas2_mixer.c | -rw-r--r-- | 8.2 KB |
pas2_pcm.c | -rw-r--r-- | 9.4 KB |
pss.c | -rw-r--r-- | 32.2 KB |
sb.h | -rw-r--r-- | 5.2 KB |
sb_audio.c | -rw-r--r-- | 26.7 KB |
sb_card.c | -rw-r--r-- | 9.7 KB |
sb_card.h | -rw-r--r-- | 5.7 KB |
sb_common.c | -rw-r--r-- | 29.1 KB |
sb_ess.c | -rw-r--r-- | 51.4 KB |
sb_ess.h | -rw-r--r-- | 887 bytes |
sb_midi.c | -rw-r--r-- | 4.3 KB |
sb_mixer.c | -rw-r--r-- | 19.3 KB |
sb_mixer.h | -rw-r--r-- | 2.1 KB |
sequencer.c | -rw-r--r-- | 33.7 KB |
sound_calls.h | -rw-r--r-- | 3.4 KB |
sound_config.h | -rw-r--r-- | 3.1 KB |
sound_firmware.h | -rw-r--r-- | 58 bytes |
sound_timer.c | -rw-r--r-- | 6.1 KB |
soundcard.c | -rw-r--r-- | 16.7 KB |
soundvers.h | -rw-r--r-- | 86 bytes |
swarm_cs4297a.c | -rw-r--r-- | 88.4 KB |
sys_timer.c | -rw-r--r-- | 5.2 KB |
trix.c | -rw-r--r-- | 10.9 KB |
tuning.h | -rw-r--r-- | 1.1 KB |
uart401.c | -rw-r--r-- | 10.4 KB |
uart6850.c | -rw-r--r-- | 7.1 KB |
ulaw.h | -rw-r--r-- | 3.2 KB |
v_midi.c | -rw-r--r-- | 6.3 KB |
v_midi.h | -rw-r--r-- | 281 bytes |
vidc.c | -rw-r--r-- | 12.1 KB |
vidc.h | -rw-r--r-- | 1.8 KB |
vidc_fill.S | -rw-r--r-- | 4.3 KB |
vwsnd.c | -rw-r--r-- | 95.4 KB |
waveartist.c | -rw-r--r-- | 45.9 KB |
waveartist.h | -rw-r--r-- | 2.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...