diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-03-16 09:38:40 -0400 |
---|---|---|
committer | David Herrmann <dh.herrmann@gmail.com> | 2014-07-07 18:34:02 -0400 |
commit | 6d6dfcfb883818b40b58bac61cc72cab428a7a03 (patch) | |
tree | 66924f5844a565cb6cf41aeb28b51042f831f21b | |
parent | 15f8f65751f081bd2d57627c453fe8986a3a0718 (diff) |
drm: enable render-nodes by default
We introduced render-nodes about 1/2 year ago and no problems showed up.
Remove the drm_rnodes argument and enable them by default now.
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
-rw-r--r-- | drivers/gpu/drm/drm_stub.c | 7 | ||||
-rw-r--r-- | include/drm/drmP.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 14d16464000a..07bf70121e9a 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c | |||
@@ -37,9 +37,6 @@ | |||
37 | unsigned int drm_debug = 0; /* 1 to enable debug output */ | 37 | unsigned int drm_debug = 0; /* 1 to enable debug output */ |
38 | EXPORT_SYMBOL(drm_debug); | 38 | EXPORT_SYMBOL(drm_debug); |
39 | 39 | ||
40 | unsigned int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ | ||
41 | EXPORT_SYMBOL(drm_rnodes); | ||
42 | |||
43 | /* 1 to allow user space to request universal planes (experimental) */ | 40 | /* 1 to allow user space to request universal planes (experimental) */ |
44 | unsigned int drm_universal_planes = 0; | 41 | unsigned int drm_universal_planes = 0; |
45 | EXPORT_SYMBOL(drm_universal_planes); | 42 | EXPORT_SYMBOL(drm_universal_planes); |
@@ -60,13 +57,11 @@ MODULE_AUTHOR(CORE_AUTHOR); | |||
60 | MODULE_DESCRIPTION(CORE_DESC); | 57 | MODULE_DESCRIPTION(CORE_DESC); |
61 | MODULE_LICENSE("GPL and additional rights"); | 58 | MODULE_LICENSE("GPL and additional rights"); |
62 | MODULE_PARM_DESC(debug, "Enable debug output"); | 59 | MODULE_PARM_DESC(debug, "Enable debug output"); |
63 | MODULE_PARM_DESC(rnodes, "Enable experimental render nodes API"); | ||
64 | MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs]"); | 60 | MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs]"); |
65 | MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); | 61 | MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); |
66 | MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps"); | 62 | MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps"); |
67 | 63 | ||
68 | module_param_named(debug, drm_debug, int, 0600); | 64 | module_param_named(debug, drm_debug, int, 0600); |
69 | module_param_named(rnodes, drm_rnodes, int, 0600); | ||
70 | module_param_named(universal_planes, drm_universal_planes, int, 0600); | 65 | module_param_named(universal_planes, drm_universal_planes, int, 0600); |
71 | module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600); | 66 | module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600); |
72 | module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600); | 67 | module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600); |
@@ -588,7 +583,7 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver, | |||
588 | goto err_minors; | 583 | goto err_minors; |
589 | } | 584 | } |
590 | 585 | ||
591 | if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) { | 586 | if (drm_core_check_feature(dev, DRIVER_RENDER)) { |
592 | ret = drm_minor_alloc(dev, DRM_MINOR_RENDER); | 587 | ret = drm_minor_alloc(dev, DRM_MINOR_RENDER); |
593 | if (ret) | 588 | if (ret) |
594 | goto err_minors; | 589 | goto err_minors; |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 57c07cd89a6a..dc74c971b992 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -1395,7 +1395,6 @@ extern void drm_master_put(struct drm_master **master); | |||
1395 | extern void drm_put_dev(struct drm_device *dev); | 1395 | extern void drm_put_dev(struct drm_device *dev); |
1396 | extern void drm_unplug_dev(struct drm_device *dev); | 1396 | extern void drm_unplug_dev(struct drm_device *dev); |
1397 | extern unsigned int drm_debug; | 1397 | extern unsigned int drm_debug; |
1398 | extern unsigned int drm_rnodes; | ||
1399 | extern unsigned int drm_universal_planes; | 1398 | extern unsigned int drm_universal_planes; |
1400 | 1399 | ||
1401 | extern unsigned int drm_vblank_offdelay; | 1400 | extern unsigned int drm_vblank_offdelay; |