Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d49f303 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: remove all control node code 



With the ioctl and driver prep done, we can remove everything else.

Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel 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
parent 9e1de900

drivers/gpu/drm/drm_drv.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -99,8 +99,6 @@ static struct drm_minor **drm_minor_get_slot(struct drm_device *dev, 
		return &dev->primary;

		return &dev->primary;

	case DRM_MINOR_RENDER:

	case DRM_MINOR_RENDER:

		return &dev->render;

		return &dev->render;

	case DRM_MINOR_CONTROL:

		return &dev->control;

	default:

	default:

		BUG();

		BUG();

	}

	}
@@ -567,7 +565,6 @@ int drm_dev_init(struct drm_device *dev, 
err_minors:

err_minors:

	drm_minor_free(dev, DRM_MINOR_PRIMARY);

	drm_minor_free(dev, DRM_MINOR_PRIMARY);

	drm_minor_free(dev, DRM_MINOR_RENDER);

	drm_minor_free(dev, DRM_MINOR_RENDER);

	drm_minor_free(dev, DRM_MINOR_CONTROL);

	drm_fs_inode_free(dev->anon_inode);

	drm_fs_inode_free(dev->anon_inode);

err_free:

err_free:

	mutex_destroy(&dev->master_mutex);

	mutex_destroy(&dev->master_mutex);
@@ -603,7 +600,6 @@ void drm_dev_fini(struct drm_device *dev) 




	drm_minor_free(dev, DRM_MINOR_PRIMARY);

	drm_minor_free(dev, DRM_MINOR_PRIMARY);

	drm_minor_free(dev, DRM_MINOR_RENDER);

	drm_minor_free(dev, DRM_MINOR_RENDER);

	drm_minor_free(dev, DRM_MINOR_CONTROL);





	mutex_destroy(&dev->master_mutex);

	mutex_destroy(&dev->master_mutex);

	mutex_destroy(&dev->ctxlist_mutex);

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




	mutex_lock(&drm_global_mutex);

	mutex_lock(&drm_global_mutex);





	ret = drm_minor_register(dev, DRM_MINOR_CONTROL);

	if (ret)

		goto err_minors;



	ret = drm_minor_register(dev, DRM_MINOR_RENDER);

	ret = drm_minor_register(dev, DRM_MINOR_RENDER);

	if (ret)

	if (ret)

		goto err_minors;

		goto err_minors;
@@ -837,7 +829,6 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) 
	remove_compat_control_link(dev);

	remove_compat_control_link(dev);

	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);

	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);

	drm_minor_unregister(dev, DRM_MINOR_RENDER);

	drm_minor_unregister(dev, DRM_MINOR_RENDER);

	drm_minor_unregister(dev, DRM_MINOR_CONTROL);

out_unlock:

out_unlock:

	mutex_unlock(&drm_global_mutex);

	mutex_unlock(&drm_global_mutex);

	return ret;

	return ret;
@@ -882,7 +873,6 @@ void drm_dev_unregister(struct drm_device *dev) 
	remove_compat_control_link(dev);

	remove_compat_control_link(dev);

	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);

	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);

	drm_minor_unregister(dev, DRM_MINOR_RENDER);

	drm_minor_unregister(dev, DRM_MINOR_RENDER);

	drm_minor_unregister(dev, DRM_MINOR_CONTROL);

}

}

EXPORT_SYMBOL(drm_dev_unregister);

EXPORT_SYMBOL(drm_dev_unregister);

drivers/gpu/drm/drm_framebuffer.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -484,8 +484,7 @@ int drm_mode_getfb(struct drm_device *dev, 
	 * backwards-compatibility reasons, we cannot make GET_FB() privileged,

	 * backwards-compatibility reasons, we cannot make GET_FB() privileged,

	 * so just return an invalid handle for non-masters.

	 * so just return an invalid handle for non-masters.

	 */

	 */

	if (!drm_is_current_master(file_priv) && !capable(CAP_SYS_ADMIN) &&

	if (!drm_is_current_master(file_priv) && !capable(CAP_SYS_ADMIN)) {

	    !drm_is_control_client(file_priv)) {

		r->handle = 0;

		r->handle = 0;

		ret = 0;

		ret = 0;

		goto out;

		goto out;

drivers/gpu/drm/drm_ioctl.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -510,13 +510,7 @@ int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) 




	/* MASTER is only for master or control clients */

	/* MASTER is only for master or control clients */

	if (unlikely((flags & DRM_MASTER) &&

	if (unlikely((flags & DRM_MASTER) &&

		     !drm_is_current_master(file_priv) &&

		     !drm_is_current_master(file_priv)))

		     !drm_is_control_client(file_priv)))

		return -EACCES;



	/* Control clients must be explicitly allowed */

	if (unlikely(!(flags & DRM_CONTROL_ALLOW) &&

		     drm_is_control_client(file_priv)))

		return -EACCES;

		return -EACCES;





	/* Render clients must be explicitly allowed */

	/* Render clients must be explicitly allowed */

drivers/gpu/drm/drm_sysfs.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -331,9 +331,7 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor *minor) 
	struct device *kdev;

	struct device *kdev;

	int r;

	int r;





	if (minor->type == DRM_MINOR_CONTROL)

	if (minor->type == DRM_MINOR_RENDER)

		minor_str = "controlD%d";

	else if (minor->type == DRM_MINOR_RENDER)

		minor_str = "renderD%d";

		minor_str = "renderD%d";

	else

	else

		minor_str = "card%d";

		minor_str = "card%d";

include/drm/drm_device.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ struct drm_device { 
	struct device *dev;		/**< Device structure of bus-device */

	struct device *dev;		/**< Device structure of bus-device */

	struct drm_driver *driver;	/**< DRM driver managing the device */

	struct drm_driver *driver;	/**< DRM driver managing the device */

	void *dev_private;		/**< DRM driver private data */

	void *dev_private;		/**< DRM driver private data */

	struct drm_minor *control;		/**< Control node */

	struct drm_minor *primary;		/**< Primary node */

	struct drm_minor *primary;		/**< Primary node */

	struct drm_minor *render;		/**< Render node */

	struct drm_minor *render;		/**< Render node */

	bool registered;

	bool registered;