aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_ttm.c
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2013-08-13 13:10:30 -0400
committerDavid Herrmann <dh.herrmann@gmail.com>2014-03-16 07:23:42 -0400
commit44d847b7439bdea0b6c5640446427daa3ebcc7fa (patch)
tree53f8bef9b2f863ca0aa8989a98ee7ffa69add128 /drivers/gpu/drm/nouveau/nouveau_ttm.c
parent6796cb16c088905bf3af40548fda68c09e6f6ee5 (diff)
drm: init TTM dev_mapping in ttm_bo_device_init()
With dev->anon_inode we have a global address_space ready for operation right from the beginning. Therefore, there is no need to do a delayed setup with TTM. Instead, set dev_mapping during initialization in ttm_bo_device_init() and remove any "if (dev_mapping)" conditions. Cc: Dave Airlie <airlied@redhat.com> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Alex Deucher <alexdeucher@gmail.com> Cc: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_ttm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_ttm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index d45d50da978f..be3a3c9feafa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -376,7 +376,9 @@ nouveau_ttm_init(struct nouveau_drm *drm)
376 376
377 ret = ttm_bo_device_init(&drm->ttm.bdev, 377 ret = ttm_bo_device_init(&drm->ttm.bdev,
378 drm->ttm.bo_global_ref.ref.object, 378 drm->ttm.bo_global_ref.ref.object,
379 &nouveau_bo_driver, DRM_FILE_PAGE_OFFSET, 379 &nouveau_bo_driver,
380 dev->anon_inode->i_mapping,
381 DRM_FILE_PAGE_OFFSET,
380 bits <= 32 ? true : false); 382 bits <= 32 ? true : false);
381 if (ret) { 383 if (ret) {
382 NV_ERROR(drm, "error initialising bo driver, %d\n", ret); 384 NV_ERROR(drm, "error initialising bo driver, %d\n", ret);