drm: Improve on minor type helpers v3

[linux-2.6-block.git] / drivers / gpu / drm / drm_crtc.c

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 5fb02d57dae41c7780364e19a9f81992b38631fd..960ca987c20fc484444a6bf51e8f5a7d223c6130 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -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 {