diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2014-02-19 14:21:48 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-03-28 14:19:01 +0100 |
| commit | ac05dbc57ef2b8709bf48693bb25e16a63e8e71f (patch) | |
| tree | b598a45b17e29c7127e40cf4e90d38706c7ffb93 /include/drm | |
| parent | c2667355619572c9324916b62b4f6608a56de031 (diff) | |
| download | linux-ac05dbc57ef2b8709bf48693bb25e16a63e8e71f.tar.bz2 | |
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 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 2242968e7deb..3cf9f46ce2e6 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1207,6 +1207,11 @@ static inline bool drm_is_render_client(struct drm_file *file_priv) return file_priv->minor->type == DRM_MINOR_RENDER; } +static inline bool drm_is_control_client(const struct drm_file *file_priv) +{ + return file_priv->minor->type == DRM_MINOR_CONTROL; +} + /******************************************************************/ /** \name Internal function definitions */ /*@{*/ |