drm: Update the drivers for the two-ended allocation param

PATCH In review Lauri Kasanen 1 participant 1 message Mar 31, 2014

Subsystems (8)

DRM drivers DRM misc Intel i915 nouveau +4 more subsystems

lore

Share & tools

lore

Lauri Kasanen

author

2014-03-31 12:28 UTC #0 lore raw

PATCH 3/4 drm: Update the drivers for the two-ended allocation param

This updates the other drivers to build, no-op behavior-wise.

Signed-off-by Lauri Kasanen <[email protected]>

---
 drivers/gpu/drm/ast/ast_ttm.c         | 3 ++-
 drivers/gpu/drm/bochs/bochs_mm.c      | 3 ++-
 drivers/gpu/drm/cirrus/cirrus_ttm.c   | 3 ++-
 drivers/gpu/drm/i915/i915_gem.c       | 3 ++-
 drivers/gpu/drm/i915/i915_gem_gtt.c   | 3 ++-
 drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 ++-
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +-
 drivers/gpu/drm/qxl/qxl_ttm.c         | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c   | 2 +-
 9 files changed, 15 insertions(+), 9 deletions(-)

drivers/gpu/drm/ast/ast_ttm.c +2 -1

index b824622..61f9e39 100644
@@ -262,7 +262,8 @@ int ast_mm_init(struct ast_private *ast)
 				 &ast_bo_driver,
 				 dev->anon_inode->i_mapping,
 				 DRM_FILE_PAGE_OFFSET,
-				 true);
+				 true,
+				 0);
 	if (ret) {
 		DRM_ERROR("Error initialising bo driver; %d\n", ret);
 		return ret;

drivers/gpu/drm/bochs/bochs_mm.c +2 -1

index f488be5..9dfd24a 100644
@@ -228,7 +228,8 @@ int bochs_mm_init(struct bochs_device *bochs)
 				 &bochs_bo_driver,
 				 bochs->dev->anon_inode->i_mapping,
 				 DRM_FILE_PAGE_OFFSET,
-				 true);
+				 true,
+				 0);
 	if (ret) {
 		DRM_ERROR("Error initialising bo driver; %d\n", ret);
 		return ret;

drivers/gpu/drm/cirrus/cirrus_ttm.c +2 -1

index 92e6b77..74e8e21 100644
@@ -262,7 +262,8 @@ int cirrus_mm_init(struct cirrus_device *cirrus)
 				 &cirrus_bo_driver,
 				 dev->anon_inode->i_mapping,
 				 DRM_FILE_PAGE_OFFSET,
-				 true);
+				 true,
+				 0);
 	if (ret) {
 		DRM_ERROR("Error initialising bo driver; %d\n", ret);
 		return ret;

drivers/gpu/drm/i915/i915_gem.c +2 -1

index 9c52f68..489bc33 100644
@@ -3270,7 +3270,8 @@ search_free:
 	ret = drm_mm_insert_node_in_range_generic(&vm->mm, &vma->node,
 						  size, alignment,
 						  obj->cache_level, 0, gtt_max,
-						  DRM_MM_SEARCH_DEFAULT);
+						  DRM_MM_SEARCH_DEFAULT,
+						  DRM_MM_CREATE_DEFAULT);
 	if (ret) {
 		ret = i915_gem_evict_something(dev, vm, size, alignment,
 					       obj->cache_level, flags);

drivers/gpu/drm/i915/i915_gem_gtt.c +2 -1

index 63a6dc7..dd72d35 100644
@@ -1072,7 +1072,8 @@ alloc:
 						  &ppgtt->node, GEN6_PD_SIZE,
 						  GEN6_PD_ALIGN, 0,
 						  0, dev_priv->gtt.base.total,
-						  DRM_MM_SEARCH_DEFAULT);
+						  DRM_MM_SEARCH_DEFAULT,
+						  DRM_MM_CREATE_DEFAULT);
 	if (ret == -ENOSPC && !retried) {
 		ret = i915_gem_evict_something(dev, &dev_priv->gtt.base,
 					       GEN6_PD_SIZE, GEN6_PD_ALIGN,

drivers/gpu/drm/mgag200/mgag200_ttm.c +2 -1

index 5a00e90..6844b24 100644
@@ -262,7 +262,8 @@ int mgag200_mm_init(struct mga_device *mdev)
 				 &mgag200_bo_driver,
 				 dev->anon_inode->i_mapping,
 				 DRM_FILE_PAGE_OFFSET,
-				 true);
+				 true,
+				 0);
 	if (ret) {
 		DRM_ERROR("Error initialising bo driver; %d\n", ret);
 		return ret;

drivers/gpu/drm/nouveau/nouveau_ttm.c +1 -1

index ab0228f..3fef97c 100644
@@ -384,7 +384,7 @@ nouveau_ttm_init(struct nouveau_drm *drm)
 				  &nouveau_bo_driver,
 				  dev->anon_inode->i_mapping,
 				  DRM_FILE_PAGE_OFFSET,
-				  bits <= 32 ? true : false);
+				  bits <= 32 ? true : false, 0);
 	if (ret) {
 		NV_ERROR(drm, "error initialising bo driver, %d\n", ret);
 		return ret;

drivers/gpu/drm/qxl/qxl_ttm.c +1 -1

index 29c02e0..8401a00 100644
@@ -495,7 +495,7 @@ int qxl_ttm_init(struct qxl_device *qdev)
 			       qdev->mman.bo_global_ref.ref.object,
 			       &qxl_bo_driver,
 			       qdev->ddev->anon_inode->i_mapping,
-			       DRM_FILE_PAGE_OFFSET, 0);
+			       DRM_FILE_PAGE_OFFSET, 0, 0);
 	if (r) {
 		DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
 		return r;

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 -1

index c700958..59a50dd 100644
@@ -725,7 +725,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 				 &vmw_bo_driver,
 				 dev->anon_inode->i_mapping,
 				 VMWGFX_FILE_PAGE_OFFSET,
-				 false);
+				 false, 0);
 	if (unlikely(ret != 0)) {
 		DRM_ERROR("Failed initializing TTM buffer object driver.\n");
 		goto out_err1;

Signature · 1 line

1.8.3.1