Skip to content

Commit 0d49f30

Browse files
danvetdanvet
committed
drm: remove all control node code
With the ioctl and driver prep done, we can remove everything else. Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Gustavo Padovan <gustavo@padovan.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: David Airlie <airlied@linux.ie> Link: https://patchwork.freedesktop.org/patch/msgid/20180420065159.4531-4-daniel.vetter@ffwll.ch
1 parent 9e1de90 commit 0d49f30

File tree

7 files changed

+3
-43
lines changed

7 files changed

+3
-43
lines changed

‎drivers/gpu/drm/drm_drv.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ static struct drm_minor **drm_minor_get_slot(struct drm_device *dev,
9999
return &dev->primary;
100100
case DRM_MINOR_RENDER:
101101
return &dev->render;
102-
case DRM_MINOR_CONTROL:
103-
return &dev->control;
104102
default:
105103
BUG();
106104
}
@@ -567,7 +565,6 @@ int drm_dev_init(struct drm_device *dev,
567565
err_minors:
568566
drm_minor_free(dev, DRM_MINOR_PRIMARY);
569567
drm_minor_free(dev, DRM_MINOR_RENDER);
570-
drm_minor_free(dev, DRM_MINOR_CONTROL);
571568
drm_fs_inode_free(dev->anon_inode);
572569
err_free:
573570
mutex_destroy(&dev->master_mutex);
@@ -603,7 +600,6 @@ void drm_dev_fini(struct drm_device *dev)
603600

604601
drm_minor_free(dev, DRM_MINOR_PRIMARY);
605602
drm_minor_free(dev, DRM_MINOR_RENDER);
606-
drm_minor_free(dev, DRM_MINOR_CONTROL);
607603

608604
mutex_destroy(&dev->master_mutex);
609605
mutex_destroy(&dev->ctxlist_mutex);
@@ -796,10 +792,6 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
796792

797793
mutex_lock(&drm_global_mutex);
798794

799-
ret = drm_minor_register(dev, DRM_MINOR_CONTROL);
800-
if (ret)
801-
goto err_minors;
802-
803795
ret = drm_minor_register(dev, DRM_MINOR_RENDER);
804796
if (ret)
805797
goto err_minors;
@@ -837,7 +829,6 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
837829
remove_compat_control_link(dev);
838830
drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
839831
drm_minor_unregister(dev, DRM_MINOR_RENDER);
840-
drm_minor_unregister(dev, DRM_MINOR_CONTROL);
841832
out_unlock:
842833
mutex_unlock(&drm_global_mutex);
843834
return ret;
@@ -882,7 +873,6 @@ void drm_dev_unregister(struct drm_device *dev)
882873
remove_compat_control_link(dev);
883874
drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
884875
drm_minor_unregister(dev, DRM_MINOR_RENDER);
885-
drm_minor_unregister(dev, DRM_MINOR_CONTROL);
886876
}
887877
EXPORT_SYMBOL(drm_dev_unregister);
888878

‎drivers/gpu/drm/drm_framebuffer.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,7 @@ int drm_mode_getfb(struct drm_device *dev,
484484
* backwards-compatibility reasons, we cannot make GET_FB() privileged,
485485
* so just return an invalid handle for non-masters.
486486
*/
487-
if (!drm_is_current_master(file_priv) && !capable(CAP_SYS_ADMIN) &&
488-
!drm_is_control_client(file_priv)) {
487+
if (!drm_is_current_master(file_priv) && !capable(CAP_SYS_ADMIN)) {
489488
r->handle = 0;
490489
ret = 0;
491490
goto out;

‎drivers/gpu/drm/drm_ioctl.c‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -510,13 +510,7 @@ int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
510510

511511
/* MASTER is only for master or control clients */
512512
if (unlikely((flags & DRM_MASTER) &&
513-
!drm_is_current_master(file_priv) &&
514-
!drm_is_control_client(file_priv)))
515-
return -EACCES;
516-
517-
/* Control clients must be explicitly allowed */
518-
if (unlikely(!(flags & DRM_CONTROL_ALLOW) &&
519-
drm_is_control_client(file_priv)))
513+
!drm_is_current_master(file_priv)))
520514
return -EACCES;
521515

522516
/* Render clients must be explicitly allowed */

‎drivers/gpu/drm/drm_sysfs.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,7 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor *minor)
331331
struct device *kdev;
332332
int r;
333333

334-
if (minor->type == DRM_MINOR_CONTROL)
335-
minor_str = "controlD%d";
336-
else if (minor->type == DRM_MINOR_RENDER)
334+
if (minor->type == DRM_MINOR_RENDER)
337335
minor_str = "renderD%d";
338336
else
339337
minor_str = "card%d";

‎include/drm/drm_device.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ struct drm_device {
3838
struct device *dev; /**< Device structure of bus-device */
3939
struct drm_driver *driver; /**< DRM driver managing the device */
4040
void *dev_private; /**< DRM driver private data */
41-
struct drm_minor *control; /**< Control node */
4241
struct drm_minor *primary; /**< Primary node */
4342
struct drm_minor *render; /**< Render node */
4443
bool registered;

‎include/drm/drm_file.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ struct device;
4949

5050
enum drm_minor_type {
5151
DRM_MINOR_PRIMARY,
52-
DRM_MINOR_CONTROL,
5352
DRM_MINOR_RENDER,
5453
};
5554

@@ -348,18 +347,6 @@ static inline bool drm_is_render_client(const struct drm_file *file_priv)
348347
return file_priv->minor->type == DRM_MINOR_RENDER;
349348
}
350349

351-
/**
352-
* drm_is_control_client - is this an open file of the control node
353-
* @file_priv: DRM file
354-
*
355-
* Control nodes are deprecated and in the process of getting removed from the
356-
* DRM userspace API. Do not ever use!
357-
*/
358-
static inline bool drm_is_control_client(const struct drm_file *file_priv)
359-
{
360-
return file_priv->minor->type == DRM_MINOR_CONTROL;
361-
}
362-
363350
int drm_open(struct inode *inode, struct file *filp);
364351
ssize_t drm_read(struct file *filp, char __user *buffer,
365352
size_t count, loff_t *offset);

‎include/drm/drm_ioctl.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,6 @@ enum drm_ioctl_flags {
108108
* This is equivalent to callers with the SYSADMIN capability.
109109
*/
110110
DRM_ROOT_ONLY = BIT(2),
111-
/**
112-
* @DRM_CONTROL_ALLOW:
113-
*
114-
* Deprecated, do not use. Control nodes are in the process of getting
115-
* removed.
116-
*/
117-
DRM_CONTROL_ALLOW = BIT(3),
118111
/**
119112
* @DRM_UNLOCKED:
120113
*

0 commit comments

Comments
 (0)