Commit d1583c99 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next 

This is the 3rd respin of the drm-anon patches. They allow module unloading, use
the pin_fs_* helpers recommended by Al and are rebased on top of drm-next. Note
that there are minor conflicts with the "drm-minor" branch.

* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm: init TTM dev_mapping in ttm_bo_device_init()
  drm: use anon-inode instead of relying on cdevs
  drm: add pseudo filesystem for shared inodes
parents bcc298bc 07b48c3a

drivers/gpu/drm/ast/ast_ttm.c

+3 −2
Original line number Diff line number Diff line
@@ -259,7 +259,9 @@ int ast_mm_init(struct ast_private *ast) 


	ret = ttm_bo_device_init(&ast->ttm.bdev,

				 ast->ttm.bo_global_ref.ref.object,

				 &ast_bo_driver, DRM_FILE_PAGE_OFFSET,

				 &ast_bo_driver,

				 dev->anon_inode->i_mapping,

				 DRM_FILE_PAGE_OFFSET,

				 true);

	if (ret) {

		DRM_ERROR("Error initialising bo driver; %d\n", ret);
@@ -324,7 +326,6 @@ int ast_bo_create(struct drm_device *dev, int size, int align, 
	}



	astbo->bo.bdev = &ast->ttm.bdev;

	astbo->bo.bdev->dev_mapping = dev->dev_mapping;



	ast_ttm_placement(astbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);

drivers/gpu/drm/bochs/bochs_mm.c

+4 −2
Original line number Diff line number Diff line
@@ -225,7 +225,9 @@ int bochs_mm_init(struct bochs_device *bochs) 


	ret = ttm_bo_device_init(&bochs->ttm.bdev,

				 bochs->ttm.bo_global_ref.ref.object,

				 &bochs_bo_driver, DRM_FILE_PAGE_OFFSET,

				 &bochs_bo_driver,

				 bochs->dev->anon_inode->i_mapping,

				 DRM_FILE_PAGE_OFFSET,

				 true);

	if (ret) {

		DRM_ERROR("Error initialising bo driver; %d\n", ret);
@@ -359,7 +361,7 @@ static int bochs_bo_create(struct drm_device *dev, int size, int align, 
	}



	bochsbo->bo.bdev = &bochs->ttm.bdev;

	bochsbo->bo.bdev->dev_mapping = dev->dev_mapping;

	bochsbo->bo.bdev->dev_mapping = dev->anon_inode->i_mapping;



	bochs_ttm_placement(bochsbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);

drivers/gpu/drm/cirrus/cirrus_ttm.c

+3 −2
Original line number Diff line number Diff line
@@ -259,7 +259,9 @@ int cirrus_mm_init(struct cirrus_device *cirrus) 


	ret = ttm_bo_device_init(&cirrus->ttm.bdev,

				 cirrus->ttm.bo_global_ref.ref.object,

				 &cirrus_bo_driver, DRM_FILE_PAGE_OFFSET,

				 &cirrus_bo_driver,

				 dev->anon_inode->i_mapping,

				 DRM_FILE_PAGE_OFFSET,

				 true);

	if (ret) {

		DRM_ERROR("Error initialising bo driver; %d\n", ret);
@@ -329,7 +331,6 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align, 
	}



	cirrusbo->bo.bdev = &cirrus->ttm.bdev;

	cirrusbo->bo.bdev->dev_mapping = dev->dev_mapping;



	cirrus_ttm_placement(cirrusbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);

drivers/gpu/drm/drm_fops.c

+3 −22
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ int drm_open(struct inode *inode, struct file *filp) 
	struct drm_minor *minor;

	int retcode;

	int need_setup = 0;

	struct address_space *old_mapping;

	struct address_space *old_imapping;



	minor = drm_minor_acquire(iminor(inode));

	if (IS_ERR(minor))
@@ -93,16 +91,9 @@ int drm_open(struct inode *inode, struct file *filp) 
	dev = minor->dev;

	if (!dev->open_count++)

		need_setup = 1;

	mutex_lock(&dev->struct_mutex);

	old_imapping = inode->i_mapping;

	old_mapping = dev->dev_mapping;

	if (old_mapping == NULL)

		dev->dev_mapping = &inode->i_data;

	/* ihold ensures nobody can remove inode with our i_data */

	ihold(container_of(dev->dev_mapping, struct inode, i_data));

	inode->i_mapping = dev->dev_mapping;

	filp->f_mapping = dev->dev_mapping;

	mutex_unlock(&dev->struct_mutex);



	/* share address_space across all char-devs of a single device */

	filp->f_mapping = dev->anon_inode->i_mapping;



	retcode = drm_open_helper(inode, filp, minor);

	if (retcode)
@@ -115,12 +106,6 @@ int drm_open(struct inode *inode, struct file *filp) 
	return 0;



err_undo:

	mutex_lock(&dev->struct_mutex);

	filp->f_mapping = old_imapping;

	inode->i_mapping = old_imapping;

	iput(container_of(dev->dev_mapping, struct inode, i_data));

	dev->dev_mapping = old_mapping;

	mutex_unlock(&dev->struct_mutex);

	dev->open_count--;

	drm_minor_release(minor);

	return retcode;
@@ -421,7 +406,6 @@ int drm_lastclose(struct drm_device * dev) 


	drm_legacy_dma_takedown(dev);



	dev->dev_mapping = NULL;

	mutex_unlock(&dev->struct_mutex);



	drm_legacy_dev_reinit(dev);
@@ -537,9 +521,6 @@ int drm_release(struct inode *inode, struct file *filp) 
		}

	}



	BUG_ON(dev->dev_mapping == NULL);

	iput(container_of(dev->dev_mapping, struct inode, i_data));



	/* drop the reference held my the file priv */

	if (file_priv->master)

		drm_master_put(&file_priv->master);

drivers/gpu/drm/drm_stub.c

+84 −0
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ 
 * DEALINGS IN THE SOFTWARE.

 */



#include <linux/fs.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/mount.h>

#include <linux/slab.h>

#include <drm/drmP.h>

#include <drm/drm_core.h>
@@ -459,6 +461,78 @@ void drm_unplug_dev(struct drm_device *dev) 
}

EXPORT_SYMBOL(drm_unplug_dev);



/*

 * DRM internal mount

 * We want to be able to allocate our own "struct address_space" to control

 * memory-mappings in VRAM (or stolen RAM, ...). However, core MM does not allow

 * stand-alone address_space objects, so we need an underlying inode. As there

 * is no way to allocate an independent inode easily, we need a fake internal

 * VFS mount-point.

 *

 * The drm_fs_inode_new() function allocates a new inode, drm_fs_inode_free()

 * frees it again. You are allowed to use iget() and iput() to get references to

 * the inode. But each drm_fs_inode_new() call must be paired with exactly one

 * drm_fs_inode_free() call (which does not have to be the last iput()).

 * We use drm_fs_inode_*() to manage our internal VFS mount-point and share it

 * between multiple inode-users. You could, technically, call

 * iget() + drm_fs_inode_free() directly after alloc and sometime later do an

 * iput(), but this way you'd end up with a new vfsmount for each inode.

 */



static int drm_fs_cnt;

static struct vfsmount *drm_fs_mnt;



static const struct dentry_operations drm_fs_dops = {

	.d_dname	= simple_dname,

};



static const struct super_operations drm_fs_sops = {

	.statfs		= simple_statfs,

};



static struct dentry *drm_fs_mount(struct file_system_type *fs_type, int flags,

				   const char *dev_name, void *data)

{

	return mount_pseudo(fs_type,

			    "drm:",

			    &drm_fs_sops,

			    &drm_fs_dops,

			    0x010203ff);

}



static struct file_system_type drm_fs_type = {

	.name		= "drm",

	.owner		= THIS_MODULE,

	.mount		= drm_fs_mount,

	.kill_sb	= kill_anon_super,

};



static struct inode *drm_fs_inode_new(void)

{

	struct inode *inode;

	int r;



	r = simple_pin_fs(&drm_fs_type, &drm_fs_mnt, &drm_fs_cnt);

	if (r < 0) {

		DRM_ERROR("Cannot mount pseudo fs: %d\n", r);

		return ERR_PTR(r);

	}



	inode = alloc_anon_inode(drm_fs_mnt->mnt_sb);

	if (IS_ERR(inode))

		simple_release_fs(&drm_fs_mnt, &drm_fs_cnt);



	return inode;

}



static void drm_fs_inode_free(struct inode *inode)

{

	if (inode) {

		iput(inode);

		simple_release_fs(&drm_fs_mnt, &drm_fs_cnt);

	}

}



/**

 * drm_dev_alloc - Allocate new drm device

 * @driver: DRM driver to allocate device for
@@ -499,6 +573,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver, 
	mutex_init(&dev->struct_mutex);

	mutex_init(&dev->ctxlist_mutex);



	dev->anon_inode = drm_fs_inode_new();

	if (IS_ERR(dev->anon_inode)) {

		ret = PTR_ERR(dev->anon_inode);

		DRM_ERROR("Cannot allocate anonymous inode: %d\n", ret);

		goto err_free;

	}



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = drm_minor_alloc(dev, DRM_MINOR_CONTROL);

		if (ret)
@@ -542,6 +623,8 @@ err_minors: 
	drm_minor_free(dev, DRM_MINOR_LEGACY);

	drm_minor_free(dev, DRM_MINOR_RENDER);

	drm_minor_free(dev, DRM_MINOR_CONTROL);

	drm_fs_inode_free(dev->anon_inode);

err_free:

	kfree(dev);

	return NULL;

}
@@ -556,6 +639,7 @@ static void drm_dev_release(struct kref *ref) 


	drm_ctxbitmap_cleanup(dev);

	drm_ht_remove(&dev->map_hash);

	drm_fs_inode_free(dev->anon_inode);



	drm_minor_free(dev, DRM_MINOR_LEGACY);

	drm_minor_free(dev, DRM_MINOR_RENDER);

CRA Git | Maintained and supported by SUSTech CRA and CCSE