Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-16 16:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm: Improve on minor type helpers v3

Browse Source 
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: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Thomas Hellstrom 2014-03-13 11:07:44 +01:00
parent ac05dbc57e
commit 436830571e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_crtc.c
View File

@ -1492,7 +1492,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
mutex_unlock(&file_priv->fbs_lock); mutex_unlock(&file_priv->fbs_lock);
drm_modeset_lock_all(dev); drm_modeset_lock_all(dev);
if (file_priv->minor->type != DRM_MINOR_LEGACY) { if (!drm_is_primary_client(file_priv)) {
mode_group = NULL; mode_group = NULL;
list_for_each(lh, &dev->mode_config.crtc_list) 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]; r->pitch = fb->pitches[0];
if (fb->funcs->create_handle) { if (fb->funcs->create_handle) {
if (file_priv->is_master || capable(CAP_SYS_ADMIN) || 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, ret = fb->funcs->create_handle(fb, file_priv,
&r->handle); &r->handle);
} else { } else {

6
drivers/gpu/drm/drm_fops.c
View File

@ -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 /* if there is no current master make this fd it, but do not create
* any master object for render clients */ * any master object for render clients */
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
if (!priv->minor->master && !drm_is_render_client(priv) && if (drm_is_primary_client(priv) && !priv->minor->master) {
!drm_is_control_client(priv)) {
/* create a new master */ /* create a new master */
priv->minor->master = drm_master_create(priv->minor); priv->minor->master = drm_master_create(priv->minor);
if (!priv->minor->master) { if (!priv->minor->master) {
@ -271,8 +270,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
goto out_close; goto out_close;
} }
} }
} else if (!drm_is_render_client(priv) && } else if (drm_is_primary_client(priv)) {
!drm_is_control_client(priv)) {
/* get a reference to the master */ /* get a reference to the master */
priv->master = drm_master_get(priv->minor->master); priv->master = drm_master_get(priv->minor->master);
} }

7
include/drm/drmP.h
View File

@ -1202,7 +1202,7 @@ static inline bool drm_modeset_is_locked(struct drm_device *dev)
return mutex_is_locked(&dev->mode_config.mutex); 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; 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; 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 */ /** \name Internal function definitions */
/*@{*/ /*@{*/