| Message ID | 1401360643-19363-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 29, 2014 at 6:50 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > 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. > > Cc: Inki Dae <inki.dae@samsung.com> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Seems reasonable to me. Was the type change intentional? Alex > --- > drivers/gpu/drm/drm_stub.c | 12 ++++-------- > drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 ---- > drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 -- > 3 files changed, 4 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c > index 3727ac8bc310..3901b41c214b 100644 > --- a/drivers/gpu/drm/drm_stub.c > +++ b/drivers/gpu/drm/drm_stub.c > @@ -42,18 +42,14 @@ > unsigned int drm_debug = 0; /* 1 to enable debug output */ > EXPORT_SYMBOL(drm_debug); > > -unsigned int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ > -EXPORT_SYMBOL(drm_rnodes); > +int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ > > /* 1 to allow user space to request universal planes (experimental) */ > -unsigned int drm_universal_planes = 0; > -EXPORT_SYMBOL(drm_universal_planes); > +int drm_universal_planes = 0; > > -unsigned int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ > -EXPORT_SYMBOL(drm_vblank_offdelay); > +int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ > > -unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */ > -EXPORT_SYMBOL(drm_timestamp_precision); > +int drm_timestamp_precision = 20; /* Default to 20 usecs. */ > > /* > * 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 2d27ba23a6a8..d7c50b0da510 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c > @@ -38,8 +38,6 @@ > #define DRIVER_MAJOR 1 > #define DRIVER_MINOR 0 > > -#define VBLANK_OFF_DELAY 50000 > - > /* platform device pointer for eynos drm device. */ > static struct platform_device *exynos_drm_pdev; > > @@ -109,8 +107,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) > /* setup possible_clones. */ > exynos_drm_encoder_setup(dev); > > - drm_vblank_offdelay = VBLANK_OFF_DELAY; > - > platform_set_drvdata(dev->platformdev, dev); > > /* force connectors detection */ > diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h > index ce3e6a30deaa..e28f792d628c 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; > struct exynos_drm_overlay; > struct drm_connector; > > -extern unsigned int drm_vblank_offdelay; > - > /* this enumerates display type. */ > enum exynos_drm_output_type { > EXYNOS_DISPLAY_TYPE_NONE, > -- > 1.9.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 3727ac8bc310..3901b41c214b 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -42,18 +42,14 @@ unsigned int drm_debug = 0; /* 1 to enable debug output */ EXPORT_SYMBOL(drm_debug); -unsigned int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ -EXPORT_SYMBOL(drm_rnodes); +int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ /* 1 to allow user space to request universal planes (experimental) */ -unsigned int drm_universal_planes = 0; -EXPORT_SYMBOL(drm_universal_planes); +int drm_universal_planes = 0; -unsigned int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ -EXPORT_SYMBOL(drm_vblank_offdelay); +int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ -unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */ -EXPORT_SYMBOL(drm_timestamp_precision); +int drm_timestamp_precision = 20; /* Default to 20 usecs. */ /* * 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 2d27ba23a6a8..d7c50b0da510 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -38,8 +38,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -#define VBLANK_OFF_DELAY 50000 - /* platform device pointer for eynos drm device. */ static struct platform_device *exynos_drm_pdev; @@ -109,8 +107,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) /* setup possible_clones. */ exynos_drm_encoder_setup(dev); - drm_vblank_offdelay = VBLANK_OFF_DELAY; - platform_set_drvdata(dev->platformdev, dev); /* force connectors detection */ diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index ce3e6a30deaa..e28f792d628c 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; struct exynos_drm_overlay; struct drm_connector; -extern unsigned int drm_vblank_offdelay; - /* this enumerates display type. */ enum exynos_drm_output_type { EXYNOS_DISPLAY_TYPE_NONE,
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. Cc: Inki Dae <inki.dae@samsung.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/drm_stub.c | 12 ++++-------- drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 ---- drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 -- 3 files changed, 4 insertions(+), 14 deletions(-)