aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-05-29 13:25:55 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-06-18 07:50:16 -0400
commita1bc07c5205193ff1d771f4ef23402ae1400d42a (patch)
tree6ed7479bf4dffd1b3c623eeb70d2ef036dc4e545
parentbc1dfff04a5d4064ba0db1fab13f84ab4f333d2b (diff)
drm: Don't export internal module variables
Drivers really have no business touching these. Noticed because exynose _did_ touch the vblank off delay, which could potentially affect other drivers. drm_debug is an exception since it's used in macros and inline functions. Note that this reduces the timeout on exynos from 50s to 5s. Apparently this was done to paper over a vblank get/put race in exynos, but really should be fixed properly somewhere else. Spotted by David. v2: Drop bonghits changes. Note to self: Don't submit patches before first coffee. Cc: Inki Dae <inki.dae@samsung.com> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/drm_stub.c4
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.c4
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.h2
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 14d16464000a..f4148bfcb26d 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -38,17 +38,13 @@ unsigned int drm_debug = 0; /* 1 to enable debug output */
38EXPORT_SYMBOL(drm_debug); 38EXPORT_SYMBOL(drm_debug);
39 39
40unsigned int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ 40unsigned int drm_rnodes = 0; /* 1 to enable experimental render nodes API */
41EXPORT_SYMBOL(drm_rnodes);
42 41
43/* 1 to allow user space to request universal planes (experimental) */ 42/* 1 to allow user space to request universal planes (experimental) */
44unsigned int drm_universal_planes = 0; 43unsigned int drm_universal_planes = 0;
45EXPORT_SYMBOL(drm_universal_planes);
46 44
47unsigned int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ 45unsigned int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */
48EXPORT_SYMBOL(drm_vblank_offdelay);
49 46
50unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */ 47unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */
51EXPORT_SYMBOL(drm_timestamp_precision);
52 48
53/* 49/*
54 * Default to use monotonic timestamps for wait-for-vblank and page-flip 50 * Default to use monotonic timestamps for wait-for-vblank and page-flip
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index d91f27777537..ddb5003f67f5 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -39,8 +39,6 @@
39#define DRIVER_MAJOR 1 39#define DRIVER_MAJOR 1
40#define DRIVER_MINOR 0 40#define DRIVER_MINOR 0
41 41
42#define VBLANK_OFF_DELAY 50000
43
44static struct platform_device *exynos_drm_pdev; 42static struct platform_device *exynos_drm_pdev;
45 43
46static DEFINE_MUTEX(drm_component_lock); 44static DEFINE_MUTEX(drm_component_lock);
@@ -103,8 +101,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
103 /* setup possible_clones. */ 101 /* setup possible_clones. */
104 exynos_drm_encoder_setup(dev); 102 exynos_drm_encoder_setup(dev);
105 103
106 drm_vblank_offdelay = VBLANK_OFF_DELAY;
107
108 platform_set_drvdata(dev->platformdev, dev); 104 platform_set_drvdata(dev->platformdev, dev);
109 105
110 /* Try to bind all sub drivers. */ 106 /* Try to bind all sub drivers. */
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 36535f398848..fca4b98c4077 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -40,8 +40,6 @@ struct drm_device;
40struct exynos_drm_overlay; 40struct exynos_drm_overlay;
41struct drm_connector; 41struct drm_connector;
42 42
43extern unsigned int drm_vblank_offdelay;
44
45/* This enumerates device type. */ 43/* This enumerates device type. */
46enum exynos_drm_device_type { 44enum exynos_drm_device_type {
47 EXYNOS_DEVICE_TYPE_NONE, 45 EXYNOS_DEVICE_TYPE_NONE,