drm/ttm: Remove file_page_offset parameter from ttm_bo_device_init()

The parameter file_page_offset is a constant shared by all drivers. Just
replace it with the constant itself.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index d5349c631ffc2b750b9fbf72abd7bf99c5722d39..d5140d0085d4d38584830fd6b0ac7800d7980ddf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1618,7 +1618,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
        r = ttm_bo_device_init(&adev->mman.bdev,
                               &amdgpu_bo_driver,
                               adev->ddev->anon_inode->i_mapping,
-                              DRM_FILE_PAGE_OFFSET,
                               adev->need_dma32);
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);

diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index c168d62fe8f9742e280fa287d38fe79a8c98554f..c410804a5e2c988509922074cbd98e5522403116 100644 (file)
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -178,7 +178,6 @@ int ast_mm_init(struct ast_private *ast)
        ret = ttm_bo_device_init(&ast->ttm.bdev,
                                 &ast_bo_driver,
                                 dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET,
                                 true);
        if (ret) {
                DRM_ERROR("Error initialising bo driver; %d\n", ret);

diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
index 49463348a07aaf02e14ab925c37544c5eb1a2902..ebc9dbd94923d46dc432fb605ff22a0eb5eb833c 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_mm.c
+++ b/drivers/gpu/drm/bochs/bochs_mm.c
@@ -156,7 +156,6 @@ int bochs_mm_init(struct bochs_device *bochs)
        ret = ttm_bo_device_init(&bochs->ttm.bdev,
                                 &bochs_bo_driver,
                                 bochs->dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET,
                                 true);
        if (ret) {
                DRM_ERROR("Error initialising bo driver; %d\n", ret);

diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index e075810b4bd4063af7334d0543123c28c44198a9..223a75ba77a8302eee7a276d989ae458b4eaddb4 100644 (file)
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -178,7 +178,6 @@ int cirrus_mm_init(struct cirrus_device *cirrus)
        ret = ttm_bo_device_init(&cirrus->ttm.bdev,
                                 &cirrus_bo_driver,
                                 dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET,
                                 true);
        if (ret) {
                DRM_ERROR("Error initialising bo driver; %d\n", ret);

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index a06725c2bbfa70446c541463dc42379df6b120d5..8454889228653bbf35e32d4c29c10669c743c061 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -189,7 +189,6 @@ int hibmc_mm_init(struct hibmc_drm_private *hibmc)
        ret = ttm_bo_device_init(&hibmc->bdev,
                                 &hibmc_bo_driver,
                                 dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET,
                                 true);
        if (ret) {
                DRM_ERROR("error initializing bo driver: %d\n", ret);

diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index d96a9b32455e6f5814e7454f482e62068a557b1f..ce739da5161d88c1d24c7a7b80d35da6385e0893 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -178,7 +178,6 @@ int mgag200_mm_init(struct mga_device *mdev)
        ret = ttm_bo_device_init(&mdev->ttm.bdev,
                                 &mgag200_bo_driver,
                                 dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET,
                                 true);
        if (ret) {
                DRM_ERROR("Error initialising bo driver; %d\n", ret);

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 1543c2f8d3d3312f267e17c03168fab29370aa77..c66467232604f261f6ca546357d900460d0cbf7b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -239,7 +239,6 @@ nouveau_ttm_init(struct nouveau_drm *drm)
        ret = ttm_bo_device_init(&drm->ttm.bdev,
                                  &nouveau_bo_driver,
                                  dev->anon_inode->i_mapping,
-                                 DRM_FILE_PAGE_OFFSET,
                                  drm->client.mmu.dmabits <= 32 ? true : false);
        if (ret) {
                NV_ERROR(drm, "error initialising bo driver, %d\n", ret);

diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 92f5db5b296f5275e22ea14f4ec700e894193ee3..6b3b92d1f17ffdc5fb7acad91c55e65714d290fb 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -328,7 +328,7 @@ int qxl_ttm_init(struct qxl_device *qdev)
        r = ttm_bo_device_init(&qdev->mman.bdev,
                               &qxl_bo_driver,
                               qdev->ddev.anon_inode->i_mapping,
-                              DRM_FILE_PAGE_OFFSET, 0);
+                              false);
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
                return r;

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 071a872e5b02291230b43648491f628e1b3994e4..7c10e1560780ca037abc832c607d526bf287a8ac 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -790,7 +790,6 @@ int radeon_ttm_init(struct radeon_device *rdev)
        r = ttm_bo_device_init(&rdev->mman.bdev,
                               &radeon_bo_driver,
                               rdev->ddev->anon_inode->i_mapping,
-                              DRM_FILE_PAGE_OFFSET,
                               rdev->need_dma32);
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 3f56647cdb35f94ddcead862b286516ad903150e..e1b65775f3eea235dfdddf04ab94f4a3550a9ee8 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1624,7 +1624,6 @@ EXPORT_SYMBOL(ttm_bo_device_release);
 int ttm_bo_device_init(struct ttm_bo_device *bdev,
                       struct ttm_bo_driver *driver,
                       struct address_space *mapping,
-                      uint64_t file_page_offset,
                       bool need_dma32)
 {
        struct ttm_bo_global *glob = &ttm_bo_glob;
@@ -1646,7 +1645,8 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
        if (unlikely(ret != 0))
                goto out_no_sys;
 
-       drm_vma_offset_manager_init(&bdev->vma_manager, file_page_offset,
+       drm_vma_offset_manager_init(&bdev->vma_manager,
+                                   DRM_FILE_PAGE_OFFSET,
                                    0x10000000);
        INIT_DELAYED_WORK(&bdev->wq, ttm_bo_delayed_workqueue);
        INIT_LIST_HEAD(&bdev->ddestroy);

diff --git a/drivers/gpu/drm/virtio/virtgpu_ttm.c b/drivers/gpu/drm/virtio/virtgpu_ttm.c
index 64f5b8dec3e9f2ad645d76ef2398b80edea23767..d6225ba20b30422247442309165c50908f96e49c 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ttm.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ttm.c
@@ -328,7 +328,7 @@ int virtio_gpu_ttm_init(struct virtio_gpu_device *vgdev)
        r = ttm_bo_device_init(&vgdev->mman.bdev,
                               &virtio_gpu_bo_driver,
                               vgdev->ddev->anon_inode->i_mapping,
-                              DRM_FILE_PAGE_OFFSET, 0);
+                              false);
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
                goto err_dev_init;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index a31d38e2216f85cfb1b9c370d8b26d583c966465..be25ce9440adee242f1f913f42b18858fd3dca91 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -851,7 +851,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
        ret = ttm_bo_device_init(&dev_priv->bdev,
                                 &vmw_bo_driver,
                                 dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET,
                                 false);
        if (unlikely(ret != 0)) {
                DRM_ERROR("Failed initializing TTM buffer object driver.\n");

diff --git a/drivers/staging/vboxvideo/vbox_ttm.c b/drivers/staging/vboxvideo/vbox_ttm.c
index 30f270027acf7a07c92cf4ade805524e96abea11..b7db7a7952d4f6bcffc1576497cf5249b683f380 100644 (file)
--- a/drivers/staging/vboxvideo/vbox_ttm.c
+++ b/drivers/staging/vboxvideo/vbox_ttm.c
@@ -156,7 +156,7 @@ int vbox_mm_init(struct vbox_private *vbox)
        ret = ttm_bo_device_init(&vbox->ttm.bdev,
                                 &vbox_bo_driver,
                                 dev->anon_inode->i_mapping,
-                                DRM_FILE_PAGE_OFFSET, true);
+                                true);
        if (ret) {
                DRM_ERROR("Error initialising bo driver; %d\n", ret);
                return ret;

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index c0bed72492f3afec026c97cd449c3a821137f328..ff0ec43fce7fc23b4ab19b33461eb5c671a5f9d2 100644 (file)
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -599,7 +599,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev);
 int ttm_bo_device_init(struct ttm_bo_device *bdev,
                       struct ttm_bo_driver *driver,
                       struct address_space *mapping,
-                      uint64_t file_page_offset, bool need_dma32);
+                      bool need_dma32);
 
 /**
  * ttm_bo_unmap_virtual