drm/ttm: call ttm_bo_cleanup_refs with reservation and lru lock held, v3
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>
Thu, 29 Nov 2012 11:36:54 +0000 (11:36 +0000)
committerDave Airlie <airlied@redhat.com>
Mon, 10 Dec 2012 10:21:03 +0000 (20:21 +1000)
commit85b144f860176ec18db927d6d9ecdfb24d9c6483
tree22c7d066d82286c7638bd974089ef0a682d0c4dd
parent6ed9ccb41209b93409c92eb8c130eada4e0832ef
drm/ttm: call ttm_bo_cleanup_refs with reservation and lru lock held, v3

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>
drivers/gpu/drm/ttm/ttm_bo.c