Commit 094aa54f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Some ocd in drm_file.c 



Move the open helper around to avoid the forward decl, and give
drm_setup a drm_legacy_ prefix since it's all legacy stuff in there.

v2: Move drm_legacy_setup into drm_legacy_misc.c (Chris). The
counterpart in the form of drm_legacy_dev_reinit is there already too,
plus it fits perfectly into Dave's work of making DRIVER_LEGACY code
compile-time optional.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190502135603.20413-1-daniel.vetter@ffwll.ch
parent 752c4f3c

drivers/gpu/drm/drm_file.c

+50 −72
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ DEFINE_MUTEX(drm_global_mutex); 
 * :ref:`IOCTL support in the userland interfaces chapter<drm_driver_ioctl>`.

 */



static int drm_open_helper(struct file *filp, struct drm_minor *minor);



/**

 * drm_file_alloc - allocate file context

 * @minor: minor to allocate on
@@ -273,76 +271,6 @@ static void drm_close_helper(struct file *filp) 
	drm_file_free(file_priv);

}



static int drm_setup(struct drm_device * dev)

{

	int ret;



	if (dev->driver->firstopen &&

	    drm_core_check_feature(dev, DRIVER_LEGACY)) {

		ret = dev->driver->firstopen(dev);

		if (ret != 0)

			return ret;

	}



	ret = drm_legacy_dma_setup(dev);

	if (ret < 0)

		return ret;





	DRM_DEBUG("\n");

	return 0;

}



/**

 * drm_open - open method for DRM file

 * @inode: device inode

 * @filp: file pointer.

 *

 * This function must be used by drivers as their &file_operations.open method.

 * It looks up the correct DRM device and instantiates all the per-file

 * resources for it. It also calls the &drm_driver.open driver callback.

 *

 * RETURNS:

 *

 * 0 on success or negative errno value on falure.

 */

int drm_open(struct inode *inode, struct file *filp)

{

	struct drm_device *dev;

	struct drm_minor *minor;

	int retcode;

	int need_setup = 0;



	minor = drm_minor_acquire(iminor(inode));

	if (IS_ERR(minor))

		return PTR_ERR(minor);



	dev = minor->dev;

	if (!dev->open_count++)

		need_setup = 1;



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

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



	retcode = drm_open_helper(filp, minor);

	if (retcode)

		goto err_undo;

	if (need_setup) {

		retcode = drm_setup(dev);

		if (retcode) {

			drm_close_helper(filp);

			goto err_undo;

		}

	}

	return 0;



err_undo:

	dev->open_count--;

	drm_minor_release(minor);

	return retcode;

}

EXPORT_SYMBOL(drm_open);



/*

 * Check whether DRI will run on this CPU.

 *
@@ -424,6 +352,56 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor) 
	return 0;

}



/**

 * drm_open - open method for DRM file

 * @inode: device inode

 * @filp: file pointer.

 *

 * This function must be used by drivers as their &file_operations.open method.

 * It looks up the correct DRM device and instantiates all the per-file

 * resources for it. It also calls the &drm_driver.open driver callback.

 *

 * RETURNS:

 *

 * 0 on success or negative errno value on falure.

 */

int drm_open(struct inode *inode, struct file *filp)

{

	struct drm_device *dev;

	struct drm_minor *minor;

	int retcode;

	int need_setup = 0;



	minor = drm_minor_acquire(iminor(inode));

	if (IS_ERR(minor))

		return PTR_ERR(minor);



	dev = minor->dev;

	if (!dev->open_count++)

		need_setup = 1;



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

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



	retcode = drm_open_helper(filp, minor);

	if (retcode)

		goto err_undo;

	if (need_setup) {

		retcode = drm_legacy_setup(dev);

		if (retcode) {

			drm_close_helper(filp);

			goto err_undo;

		}

	}

	return 0;



err_undo:

	dev->open_count--;

	drm_minor_release(minor);

	return retcode;

}

EXPORT_SYMBOL(drm_open);



void drm_lastclose(struct drm_device * dev)

{

	DRM_DEBUG("\n");

drivers/gpu/drm/drm_legacy.h

+2 −0
Original line number Diff line number Diff line
@@ -187,10 +187,12 @@ int drm_legacy_sg_free(struct drm_device *dev, void *data, 
void drm_legacy_init_members(struct drm_device *dev);

void drm_legacy_destroy_members(struct drm_device *dev);

void drm_legacy_dev_reinit(struct drm_device *dev);

int drm_legacy_setup(struct drm_device * dev);

#else

static inline void drm_legacy_init_members(struct drm_device *dev) {}

static inline void drm_legacy_destroy_members(struct drm_device *dev) {}

static inline void drm_legacy_dev_reinit(struct drm_device *dev) {}

static inline int drm_legacy_setup(struct drm_device * dev) { return 0; }

#endif



#if IS_ENABLED(CONFIG_DRM_LEGACY)

drivers/gpu/drm/drm_legacy_misc.c

+20 −0
Original line number Diff line number Diff line
@@ -51,6 +51,26 @@ void drm_legacy_destroy_members(struct drm_device *dev) 
	mutex_destroy(&dev->ctxlist_mutex);

}



int drm_legacy_setup(struct drm_device * dev)

{

	int ret;



	if (dev->driver->firstopen &&

	    drm_core_check_feature(dev, DRIVER_LEGACY)) {

		ret = dev->driver->firstopen(dev);

		if (ret != 0)

			return ret;

	}



	ret = drm_legacy_dma_setup(dev);

	if (ret < 0)

		return ret;





	DRM_DEBUG("\n");

	return 0;

}



void drm_legacy_dev_reinit(struct drm_device *dev)

{

	if (dev->irq_enabled)

CRA Git | Maintained and supported by SUSTech CRA and CCSE