diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-09-21 02:15:15 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-22 12:40:38 +1000 |
| commit | 0fbecd400dd0a82d465b3086f209681e8c54cb0f (patch) | |
| tree | 05a45af49f8d0bc0619aa3453fa74568ffcbf78e /drivers/gpu | |
| parent | 5222454cf941b09205d502242dd1e44fd62aa551 (diff) | |
| download | linux-stable-0fbecd400dd0a82d465b3086f209681e8c54cb0f.tar.gz linux-stable-0fbecd400dd0a82d465b3086f209681e8c54cb0f.tar.bz2 linux-stable-0fbecd400dd0a82d465b3086f209681e8c54cb0f.zip | |
drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
It makes sense for a BO to move after a process has requested
exclusive RW access on it (e.g. because the BO used to be located in
unmappable VRAM and we intercepted the CPU access from the fault
handler).
If we let the ghost object inherit cpu_writers from the original
object, ttm_bo_release_list() will raise a kernel BUG when the ghost
object is destroyed. This can be reproduced with the nouveau driver on
nv5x.
Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Tested-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 7cffb3e04232..3451a82adba7 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -351,6 +351,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, INIT_LIST_HEAD(&fbo->lru); INIT_LIST_HEAD(&fbo->swap); fbo->vm_node = NULL; + atomic_set(&fbo->cpu_writers, 0); fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj); kref_init(&fbo->list_kref); |