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

Commit c7dbc6c9 authored by Matt Roper's avatar Matt Roper Committed by Dave Airlie
Browse files

drm: Remove command line guard for universal planes 



Universal planes are ready to leave 'experimental' state so drop the
kernel command line parameter that we've been hiding them behind.
Userspace clients that wish to receive universal planes will still need
to opt-in by setting the appropriate capability bit, so this should have
no impact on existing userspace.

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ad7f8a1f

drivers/gpu/drm/drm_ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -342,8 +342,6 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) 
		file_priv->stereo_allowed = req->value;

		break;

	case DRM_CLIENT_CAP_UNIVERSAL_PLANES:

		if (!drm_universal_planes)

			return -EINVAL;

		if (req->value > 1)

			return -EINVAL;

		file_priv->universal_planes = req->value;

drivers/gpu/drm/drm_stub.c

+0 −4
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
unsigned int drm_debug = 0;	/* 1 to enable debug output */

EXPORT_SYMBOL(drm_debug);



/* 1 to allow user space to request universal planes (experimental) */

unsigned int drm_universal_planes = 0;



unsigned int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */



unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
@@ -59,7 +56,6 @@ MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); 
MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps");



module_param_named(debug, drm_debug, int, 0600);

module_param_named(universal_planes, drm_universal_planes, int, 0600);

module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);

module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);

module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);

include/drm/drmP.h

+0 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,6 @@ extern void drm_master_put(struct drm_master **master); 
extern void drm_put_dev(struct drm_device *dev);

extern void drm_unplug_dev(struct drm_device *dev);

extern unsigned int drm_debug;

extern unsigned int drm_universal_planes;



extern unsigned int drm_vblank_offdelay;

extern unsigned int drm_timestamp_precision;