diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-04-02 19:14:48 +0400 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-02 18:41:50 +0400 |
| commit | f2c24b83ae90292d315aa7ac029c6ce7929e01aa (patch) | |
| tree | 4ef7d29d97cee6231becd7565056d630770d0845 /drivers/gpu/drm/radeon/radeon_mn.c | |
| parent | 2f453ed4038526172292fb3250b638b3782c7f2b (diff) | |
| download | linux-f2c24b83ae90292d315aa7ac029c6ce7929e01aa.tar.xz | |
drm/ttm: flip the switch, and convert to dma_fence
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_mn.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_mn.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c index 0157bc2f11f8..a69bd441dd2d 100644 --- a/drivers/gpu/drm/radeon/radeon_mn.c +++ b/drivers/gpu/drm/radeon/radeon_mn.c @@ -122,6 +122,7 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn, it = interval_tree_iter_first(&rmn->objects, start, end); while (it) { struct radeon_bo *bo; + struct fence *fence; int r; bo = container_of(it, struct radeon_bo, mn_it); @@ -133,8 +134,9 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn, continue; } - if (bo->tbo.sync_obj) { - r = radeon_fence_wait(bo->tbo.sync_obj, false); + fence = reservation_object_get_excl(bo->tbo.resv); + if (fence) { + r = radeon_fence_wait((struct radeon_fence *)fence, false); if (r) DRM_ERROR("(%d) failed to wait for user bo\n", r); } |