From: Vasiliy Ulyanov Date: Thu, 5 Nov 2015 14:43:49 +0000 (+0300) Subject: VIGS: unbind ttm bo before swapout X-Git-Tag: Tizen_Studio_1.3_Release_p3.0^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c722b3e7d443e15654638c90a2687529bb4dc92;p=sdk%2Femulator%2Femulator-kernel.git VIGS: unbind ttm bo before swapout TTM BUGs if ttm_tt appears bound while being swaped out. Certain precautions are now taken in swap_notify ttm_bo_driver callback. Change-Id: I0c461e6d179af4b424125c1615f95738ac429d47 Signed-off-by: Vasiliy Ulyanov (cherry picked from commit c1d6b3e728436abaf4833abc66be8bf0f299506f) --- diff --git a/drivers/gpu/drm/vigs/vigs_mman.c b/drivers/gpu/drm/vigs/vigs_mman.c index fa22fdd18edf..9440d44c40fb 100644 --- a/drivers/gpu/drm/vigs/vigs_mman.c +++ b/drivers/gpu/drm/vigs/vigs_mman.c @@ -309,6 +309,11 @@ static int vigs_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) return 0; } +void vigs_ttm_swap_notify(struct ttm_buffer_object *bo) +{ + ttm_tt_unbind(bo->ttm); +} + static int vigs_ttm_io_mem_reserve(struct ttm_bo_device *bo_dev, struct ttm_mem_reg *mem) { @@ -362,6 +367,7 @@ static struct ttm_bo_driver vigs_ttm_bo_driver = .move = &vigs_ttm_move, .verify_access = &vigs_ttm_verify_access, .fault_reserve_notify = &vigs_ttm_fault_reserve_notify, + .swap_notify = &vigs_ttm_swap_notify, .io_mem_reserve = &vigs_ttm_io_mem_reserve, .io_mem_free = &vigs_ttm_io_mem_free, };