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

Commit 43683057 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm: Improve on minor type helpers v3 



Add a drm_is_legacy() helper, constify argument to drm_is_render_client(),
and use / change helpers where appropriate.

v2: s/drm_is_legacy/drm_is_legacy_client/ and adapt to new code context.
v3: s/legacy_client/primary_client/

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
parent ac05dbc5

drivers/gpu/drm/drm_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, 
	mutex_unlock(&file_priv->fbs_lock);



	drm_modeset_lock_all(dev);

	if (file_priv->minor->type != DRM_MINOR_LEGACY) {

	if (!drm_is_primary_client(file_priv)) {



		mode_group = NULL;

		list_for_each(lh, &dev->mode_config.crtc_list)
@@ -2848,7 +2848,7 @@ int drm_mode_getfb(struct drm_device *dev, 
	r->pitch = fb->pitches[0];

	if (fb->funcs->create_handle) {

		if (file_priv->is_master || capable(CAP_SYS_ADMIN) ||

		    file_priv->minor->type == DRM_MINOR_CONTROL) {

		    drm_is_control_client(file_priv)) {

			ret = fb->funcs->create_handle(fb, file_priv,

						       &r->handle);

		} else {

drivers/gpu/drm/drm_fops.c

+2 −4
Original line number Diff line number Diff line
@@ -232,8 +232,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp, 
	/* if there is no current master make this fd it, but do not create

	 * any master object for render clients */

	mutex_lock(&dev->struct_mutex);

	if (!priv->minor->master && !drm_is_render_client(priv) &&

	    !drm_is_control_client(priv)) {

	if (drm_is_primary_client(priv) && !priv->minor->master) {

		/* create a new master */

		priv->minor->master = drm_master_create(priv->minor);

		if (!priv->minor->master) {
@@ -271,8 +270,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp, 
				goto out_close;

			}

		}

	} else if (!drm_is_render_client(priv) &&

		   !drm_is_control_client(priv)) {

	} else if (drm_is_primary_client(priv)) {

		/* get a reference to the master */

		priv->master = drm_master_get(priv->minor->master);

	}

include/drm/drmP.h

+6 −1
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ static inline bool drm_modeset_is_locked(struct drm_device *dev) 
	return mutex_is_locked(&dev->mode_config.mutex);

}



static inline bool drm_is_render_client(struct drm_file *file_priv)

static inline bool drm_is_render_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_RENDER;

}
@@ -1212,6 +1212,11 @@ static inline bool drm_is_control_client(const struct drm_file *file_priv) 
	return file_priv->minor->type == DRM_MINOR_CONTROL;

}



static inline bool drm_is_primary_client(const struct drm_file *file_priv)

{

	return file_priv->minor->type == DRM_MINOR_LEGACY;

}



/******************************************************************/

/** \name Internal function definitions */

/*@{*/