diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2021-03-31 11:16:06 -0700 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2021-03-31 11:16:06 -0700 |
| commit | 3d98a30977d1de975ad1d812cb2d817a3f7a9d23 (patch) | |
| tree | 745f5c275e94445aa032b6aab46f2f9629130dbb /drivers/gpu/drm | |
| parent | 9fb57b9173c3703d3b543e6823f2d6c9647b83f1 (diff) | |
Revert "drm/openchrome: switch to own vma manager"
This reverts commit 536f622d1ae3947c2d092fcf38a48aa33922cab2.
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/openchrome/openchrome_drv.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/openchrome/openchrome_object.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h index ef10750d9999..01ab292eda22 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.h +++ b/drivers/gpu/drm/openchrome/openchrome_drv.h @@ -216,7 +216,6 @@ struct openchrome_drm_private { struct drm_device *dev; struct ttm_bo_device bdev; - struct drm_vma_offset_manager vma_manager; /* Set this flag for ttm_bo_device_init. */ bool need_dma32; diff --git a/drivers/gpu/drm/openchrome/openchrome_object.c b/drivers/gpu/drm/openchrome/openchrome_object.c index ec78df8a3c44..a6750396cf05 100644 --- a/drivers/gpu/drm/openchrome/openchrome_object.c +++ b/drivers/gpu/drm/openchrome/openchrome_object.c @@ -273,17 +273,12 @@ int openchrome_mm_init(struct openchrome_drm_private *dev_private) DRM_DEBUG_KMS("Entered %s.\n", __func__); - drm_vma_offset_manager_init(&dev_private->vma_manager, - DRM_FILE_PAGE_OFFSET_START, - DRM_FILE_PAGE_OFFSET_SIZE); - /* * Initialize bdev ttm_bo_device struct. */ ret = ttm_bo_device_init(&dev_private->bdev, &openchrome_bo_driver, dev->anon_inode->i_mapping, - &dev_private->vma_manager, dev_private->need_dma32); if (ret) { DRM_ERROR("Failed initializing buffer object driver.\n"); @@ -313,7 +308,6 @@ void openchrome_mm_fini(struct openchrome_drm_private *dev_private) ttm_range_man_fini(&dev_private->bdev, TTM_PL_VRAM); ttm_bo_device_release(&dev_private->bdev); - drm_vma_offset_manager_destroy(&dev_private->vma_manager); DRM_DEBUG_KMS("Exiting %s.\n", __func__); } |