Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4f4e3e3 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/ttm: add reservation_object as argument to ttm_bo_init 



This allows importing reservation objects from dma-bufs.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
parent b5e9c1a2

drivers/gpu/drm/ast/ast_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,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, false, NULL, acc_size,

			  NULL, ast_bo_ttm_destroy);

			  NULL, NULL, ast_bo_ttm_destroy);

	if (ret)

		return ret;

drivers/gpu/drm/bochs/bochs_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int bochs_bo_create(struct drm_device *dev, int size, int align, 
	ret = ttm_bo_init(&bochs->ttm.bdev, &bochsbo->bo, size,

			  ttm_bo_type_device, &bochsbo->placement,

			  align >> PAGE_SHIFT, false, NULL, acc_size,

			  NULL, bochs_bo_ttm_destroy);

			  NULL, NULL, bochs_bo_ttm_destroy);

	if (ret)

		return ret;

drivers/gpu/drm/cirrus/cirrus_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,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, false, NULL, acc_size,

			  NULL, cirrus_bo_ttm_destroy);

			  NULL, NULL, cirrus_bo_ttm_destroy);

	if (ret)

		return ret;

drivers/gpu/drm/mgag200/mgag200_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,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, false, NULL, acc_size,

			  NULL, mgag200_bo_ttm_destroy);

			  NULL, NULL, mgag200_bo_ttm_destroy);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align, 
	ret = ttm_bo_init(&drm->ttm.bdev, &nvbo->bo, size,

			  type, &nvbo->placement,

			  align >> PAGE_SHIFT, false, NULL, acc_size, sg,

			  nouveau_bo_del_ttm);

			  NULL, nouveau_bo_del_ttm);

	if (ret) {

		/* ttm will call nouveau_bo_del_ttm if it fails.. */

		return ret;