diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-08-22 03:15:05 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-08-23 09:38:30 +0100 |
| commit | 8d3bb23609d4ae22803a15d232289fc09a7b61c4 (patch) | |
| tree | f48c0874a1e5c25f39c140af99a3ba722142db98 /drivers | |
| parent | eac2095398668f989a3dd8d00be1b87850d78c01 (diff) | |
| download | linux-3.10-8d3bb23609d4ae22803a15d232289fc09a7b61c4.tar.gz linux-3.10-8d3bb23609d4ae22803a15d232289fc09a7b61c4.tar.bz2 linux-3.10-8d3bb23609d4ae22803a15d232289fc09a7b61c4.zip | |
drm/ttm: ensure ttm for new node is bound before calling move_notify()
This was true for new TTM_PL_SYSTEM and new TTM_PL_TT cases, but wasn't
the case on TTM_PL_SYSTEM<->TTM_PL_TT moves, which causes trouble on some
paths as nouveau's move_notify() hook requires that the dma addresses be
valid at this point.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 384116afe5b..a4d38d85909 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -392,10 +392,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, * Create and bind a ttm if required. */ - if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED) && (bo->ttm == NULL)) { - ret = ttm_bo_add_ttm(bo, false); - if (ret) - goto out_err; + if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED)) { + if (bo->ttm == NULL) { + ret = ttm_bo_add_ttm(bo, false); + if (ret) + goto out_err; + } ret = ttm_tt_set_placement_caching(bo->ttm, mem->placement); if (ret) |