summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_fops.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2014-02-19 14:21:48 +0100
committerThomas Hellstrom <thellstrom@vmware.com>2014-03-28 14:19:01 +0100
commitac05dbc57ef2b8709bf48693bb25e16a63e8e71f (patch)
treeb598a45b17e29c7127e40cf4e90d38706c7ffb93 /drivers/gpu/drm/drm_fops.c
parentc2667355619572c9324916b62b4f6608a56de031 (diff)
downloadop-kernel-dev-ac05dbc57ef2b8709bf48693bb25e16a63e8e71f.zip
op-kernel-dev-ac05dbc57ef2b8709bf48693bb25e16a63e8e71f.tar.gz
drm: Make control nodes master-less v3
Like for render-nodes, there is no point in maintaining the master concept for control nodes, so set the struct drm_file::master pointer to NULL. At the same time, make sure DRM_MASTER | DRM_CONTROL_ALLOW ioctls are always allowed when called through the control node. Previously the caller also needed to be master. v2: Adapt to refactoring of ioctl permission check. v3: Formatting of logical expression. Use drm_is_control_client() instead of drm_is_control(). Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fops.c')
-rw-r--r--drivers/gpu/drm/drm_fops.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 9b02f12..5432a1a 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -232,7 +232,8 @@ 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)) {
+ if (!priv->minor->master && !drm_is_render_client(priv) &&
+ !drm_is_control_client(priv)) {
/* create a new master */
priv->minor->master = drm_master_create(priv->minor);
if (!priv->minor->master) {
@@ -270,7 +271,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
goto out_close;
}
}
- } else if (!drm_is_render_client(priv)) {
+ } else if (!drm_is_render_client(priv) &&
+ !drm_is_control_client(priv)) {
/* get a reference to the master */
priv->master = drm_master_get(priv->minor->master);
}
OpenPOWER on IntegriCloud