From: Dave Airlie Date: Wed, 23 May 2012 13:08:41 +0000 (+0100) Subject: drm: update ast/cirrus/mgag200 for change in TTM api X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5288b7b205ccd59ad40ef8ec270302bf94ac4697;p=linux-beck.git drm: update ast/cirrus/mgag200 for change in TTM api New drivers merged after changes were done in prime TTM code. Fix build. Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c index aad12f747175..6cf2adea66bc 100644 --- a/drivers/gpu/drm/ast/ast_ttm.c +++ b/drivers/gpu/drm/ast/ast_ttm.c @@ -357,7 +357,7 @@ int ast_bo_create(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&ast->ttm.bdev, &astbo->bo, size, ttm_bo_type_device, &astbo->placement, align >> PAGE_SHIFT, 0, false, NULL, acc_size, - ast_bo_ttm_destroy); + NULL, ast_bo_ttm_destroy); if (ret) return ret; diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c index ae2f08ff3808..2ebcd11a5023 100644 --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c @@ -357,7 +357,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&cirrus->ttm.bdev, &cirrusbo->bo, size, ttm_bo_type_device, &cirrusbo->placement, align >> PAGE_SHIFT, 0, false, NULL, acc_size, - cirrus_bo_ttm_destroy); + NULL, cirrus_bo_ttm_destroy); if (ret) return ret; diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index 12264793108f..b223dcb7a710 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c @@ -356,7 +356,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&mdev->ttm.bdev, &mgabo->bo, size, ttm_bo_type_device, &mgabo->placement, align >> PAGE_SHIFT, 0, false, NULL, acc_size, - mgag200_bo_ttm_destroy); + NULL, mgag200_bo_ttm_destroy); if (ret) return ret;