diff options
| author |   Christian König <ckoenig.leichtzumerken@gmail.com> | 2020-08-12 13:03:49 +1000 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2020-08-12 13:26:28 +1000 |
| commit | 62975d27d647a40c58d3b96c29b911fc4f33c310 (patch) | |
| tree | 4dbc81b44cfeb12bf3fe1045773c32d7a40b8f53 /drivers/gpu/drm/ttm/ttm_bo_util.c | |
| parent | Merge branch 'vmwgfx-next-5.9' of git://people.freedesktop.org/~sroland/linux into drm-next (diff) | |
| download | wireguard-linux-62975d27d647a40c58d3b96c29b911fc4f33c310.tar.xz wireguard-linux-62975d27d647a40c58d3b96c29b911fc4f33c310.zip | |
drm/ttm: revert "drm/ttm: make TT creation purely optional v3"
This reverts commit 2ddef17678bc2ea1d20517dd2b4ed4aa967ffa8b.
As it turned out VMWGFX needs a much wider audit to fix this.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200811092400.188124-1-christian.koenig@amd.com
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo_util.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 7fb3e0bcbab4..e6c8bd254055 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -531,15 +531,12 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo, .interruptible = false, .no_wait_gpu = false }; - struct ttm_tt *ttm; + struct ttm_tt *ttm = bo->ttm; pgprot_t prot; int ret; - ret = ttm_tt_create(bo, true); - if (ret) - return ret; + BUG_ON(!ttm); - ttm = bo->ttm; ret = ttm_tt_populate(ttm, &ctx); if (ret) return ret; |