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: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 436830571eb9045d563979dc6185b1d5145ca4b6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 740a9ba..57fd888 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1429,7 +1429,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)
@@ -2717,7 +2717,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 {

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 5020998..7b5d196 100644 (file)
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -241,8 +241,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) {
@@ -280,8 +279,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);
        }

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 5307f5a..967d51b 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1243,7 +1243,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;
 }
@@ -1253,6 +1253,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 */
 /*@{*/