linux-next: manual merge of the drm tree with the drm-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c

between commit:

  fd567467753f ("drm/vmwgfx: Protect from excessive execbuf kernel memory allocations v3")

from the drm-fixes tree and commit:

  a64f784bb14a ("drm/ttm: initialize globals during device init (v2)")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
index f88247046721,154eb09aa91e..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
@@@ -42,93 -42,3 +42,39 @@@ int vmw_mmap(struct file *filp, struct 
  	dev_priv = vmw_priv(file_priv->minor->dev);
  	return ttm_bo_mmap(filp, vma, &dev_priv->bdev);
  }
 +
- static int vmw_ttm_mem_global_init(struct drm_global_reference *ref)
- {
- 	DRM_INFO("global init.\n");
- 	return ttm_mem_global_init(ref->object);
- }
- 
- static void vmw_ttm_mem_global_release(struct drm_global_reference *ref)
- {
- 	ttm_mem_global_release(ref->object);
- }
- 
- int vmw_ttm_global_init(struct vmw_private *dev_priv)
- {
- 	struct drm_global_reference *global_ref;
- 	int ret;
- 
- 	global_ref = &dev_priv->mem_global_ref;
- 	global_ref->global_type = DRM_GLOBAL_TTM_MEM;
- 	global_ref->size = sizeof(struct ttm_mem_global);
- 	global_ref->init = &vmw_ttm_mem_global_init;
- 	global_ref->release = &vmw_ttm_mem_global_release;
- 
- 	ret = drm_global_item_ref(global_ref);
- 	if (unlikely(ret != 0)) {
- 		DRM_ERROR("Failed setting up TTM memory accounting.\n");
- 		return ret;
- 	}
- 
- 	dev_priv->bo_global_ref.mem_glob =
- 		dev_priv->mem_global_ref.object;
- 	global_ref = &dev_priv->bo_global_ref.ref;
- 	global_ref->global_type = DRM_GLOBAL_TTM_BO;
- 	global_ref->size = sizeof(struct ttm_bo_global);
- 	global_ref->init = &ttm_bo_global_init;
- 	global_ref->release = &ttm_bo_global_release;
- 	ret = drm_global_item_ref(global_ref);
- 
- 	if (unlikely(ret != 0)) {
- 		DRM_ERROR("Failed setting up TTM buffer objects.\n");
- 		goto out_no_bo;
- 	}
- 
- 	return 0;
- out_no_bo:
- 	drm_global_item_unref(&dev_priv->mem_global_ref);
- 	return ret;
- }
- 
- void vmw_ttm_global_release(struct vmw_private *dev_priv)
- {
- 	drm_global_item_unref(&dev_priv->bo_global_ref.ref);
- 	drm_global_item_unref(&dev_priv->mem_global_ref);
- }
- 
 +/* struct vmw_validation_mem callback */
 +static int vmw_vmt_reserve(struct vmw_validation_mem *m, size_t size)
 +{
 +	static struct ttm_operation_ctx ctx = {.interruptible = false,
 +					       .no_wait_gpu = false};
 +	struct vmw_private *dev_priv = container_of(m, struct vmw_private, vvm);
 +
 +	return ttm_mem_global_alloc(vmw_mem_glob(dev_priv), size, &ctx);
 +}
 +
 +/* struct vmw_validation_mem callback */
 +static void vmw_vmt_unreserve(struct vmw_validation_mem *m, size_t size)
 +{
 +	struct vmw_private *dev_priv = container_of(m, struct vmw_private, vvm);
 +
 +	return ttm_mem_global_free(vmw_mem_glob(dev_priv), size);
 +}
 +
 +/**
 + * vmw_validation_mem_init_ttm - Interface the validation memory tracker
 + * to ttm.
 + * @dev_priv: Pointer to struct vmw_private. The reason we choose a vmw private
 + * rather than a struct vmw_validation_mem is to make sure assumption in the
 + * callbacks that struct vmw_private derives from struct vmw_validation_mem
 + * holds true.
 + * @gran: The recommended allocation granularity
 + */
 +void vmw_validation_mem_init_ttm(struct vmw_private *dev_priv, size_t gran)
 +{
 +	struct vmw_validation_mem *vvm = &dev_priv->vvm;
 +
 +	vvm->reserve_mem = vmw_vmt_reserve;
 +	vvm->unreserve_mem = vmw_vmt_unreserve;
 +	vvm->gran = gran;
 +}

Attachment: pgpwsz2DSK12a.pgp
Description: OpenPGP digital signature