diff options
| -rw-r--r-- | drivers/gpu/drm/openchrome/openchrome_drv.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/openchrome/openchrome_object.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/openchrome/openchrome_ttm.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h index 3327cf3f3005..4411e6c0282c 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.h +++ b/drivers/gpu/drm/openchrome/openchrome_drv.h @@ -214,7 +214,7 @@ enum via_engine { struct openchrome_drm_private { struct drm_device *dev; - struct ttm_bo_device bdev; + struct ttm_device bdev; /* Set this flag for ttm_bo_device_init. */ bool need_dma32; @@ -370,7 +370,7 @@ extern int openchrome_driver_num_ioctls; extern int openchrome_hdmi_audio; -extern struct ttm_bo_driver openchrome_bo_driver; +extern struct ttm_device_funcs openchrome_bo_driver; int openchrome_vram_detect(struct openchrome_drm_private *dev_private); extern int openchrome_vram_init( @@ -397,7 +397,7 @@ void openchrome_ttm_bo_destroy(struct ttm_buffer_object *tbo); int openchrome_bo_pin(struct openchrome_bo *bo, uint32_t ttm_domain); void openchrome_bo_unpin(struct openchrome_bo *bo); int openchrome_bo_create(struct drm_device *dev, - struct ttm_bo_device *bdev, + struct ttm_device *bdev, uint64_t size, enum ttm_bo_type type, uint32_t ttm_domain, diff --git a/drivers/gpu/drm/openchrome/openchrome_object.c b/drivers/gpu/drm/openchrome/openchrome_object.c index c79f28d87d00..83fd41f711a4 100644 --- a/drivers/gpu/drm/openchrome/openchrome_object.c +++ b/drivers/gpu/drm/openchrome/openchrome_object.c @@ -169,7 +169,7 @@ void openchrome_bo_unpin(struct openchrome_bo *bo) } int openchrome_bo_create(struct drm_device *dev, - struct ttm_bo_device *bdev, + struct ttm_device *bdev, uint64_t size, enum ttm_bo_type type, uint32_t ttm_domain, @@ -291,7 +291,7 @@ int openchrome_mm_init(struct openchrome_drm_private *dev_private) /* * Initialize bdev ttm_bo_device struct. */ - ret = ttm_bo_device_init(&dev_private->bdev, + ret = ttm_device_init(&dev_private->bdev, &openchrome_bo_driver, dev->dev, dev->anon_inode->i_mapping, @@ -325,7 +325,7 @@ 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); + ttm_device_fini(&dev_private->bdev); DRM_DEBUG_KMS("Exiting %s.\n", __func__); } diff --git a/drivers/gpu/drm/openchrome/openchrome_ttm.c b/drivers/gpu/drm/openchrome/openchrome_ttm.c index fd2ebda4ce65..3f457cc7df6f 100644 --- a/drivers/gpu/drm/openchrome/openchrome_ttm.c +++ b/drivers/gpu/drm/openchrome/openchrome_ttm.c @@ -75,7 +75,7 @@ err_ttm_tt_init: return NULL; } -static void openchrome_ttm_tt_destroy(struct ttm_bo_device *bdev, +static void openchrome_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt) { ttm_tt_destroy_common(bdev, tt); @@ -152,7 +152,7 @@ static void openchrome_bo_delete_mem_notify(struct ttm_buffer_object *bo) return; } -static int openchrome_bo_io_mem_reserve(struct ttm_bo_device *bdev, +static int openchrome_bo_io_mem_reserve(struct ttm_device *bdev, struct ttm_resource *mem) { struct openchrome_drm_private *dev_private = container_of(bdev, @@ -178,7 +178,7 @@ static int openchrome_bo_io_mem_reserve(struct ttm_bo_device *bdev, return ret; } -struct ttm_bo_driver openchrome_bo_driver = { +struct ttm_device_funcs openchrome_bo_driver = { .ttm_tt_create = openchrome_ttm_tt_create, .ttm_tt_destroy = openchrome_ttm_tt_destroy, .eviction_valuable = ttm_bo_eviction_valuable, |