On Tue, Jun 23, 2015 at 02:18:58PM +0100, Daniel Stone wrote:
> Now that the interface has been proven by a port of Weston (using all
> atomic features including TEST_ONLY), remove the module parameter
> guarding the atomic API from being exposed, and let it run free in the
> wild.
>
> Signed-off-by: Daniel Stone <daniels@xxxxxxxxxxxxx>
> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Dave I think this should still fit into 4.2, can you pick it up directly?
-Daniel
> ---
> drivers/gpu/drm/drm_drv.c | 2 --
> drivers/gpu/drm/drm_ioctl.c | 3 ---
> 2 files changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 3b3c4f5..b7bf4ce 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -46,13 +46,11 @@ MODULE_AUTHOR(CORE_AUTHOR);
> MODULE_DESCRIPTION(CORE_DESC);
> MODULE_LICENSE("GPL and additional rights");
> MODULE_PARM_DESC(debug, "Enable debug output");
> -MODULE_PARM_DESC(atomic, "Enable experimental atomic KMS API");
> MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs] (0: never disable, <0: disable immediately)");
> 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_unsafe(atomic, drm_atomic, bool, 0600);
>
> static DEFINE_SPINLOCK(drm_minor_lock);
> static struct idr drm_minors_idr;
> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> index 9bac1b7..e4beca5 100644
> --- a/drivers/gpu/drm/drm_ioctl.c
> +++ b/drivers/gpu/drm/drm_ioctl.c
> @@ -350,9 +350,6 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv)
> file_priv->universal_planes = req->value;
> break;
> case DRM_CLIENT_CAP_ATOMIC:
> - /* for now, hide behind experimental drm.atomic moduleparam */
> - if (!drm_atomic)
> - return -EINVAL;
> if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
> return -EINVAL;
> if (req->value > 1)
> --
> 2.4.3
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
