diff options
author | Rob Clark <robdclark@gmail.com> | 2015-01-30 17:05:41 -0500 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2015-02-01 15:34:04 -0500 |
commit | e90dfec78ec288d6c89a7b508a5c5d4ae8b7f934 (patch) | |
tree | c9d145d296e67aebd888a0634186d0558965773c /drivers/gpu/drm/msm | |
parent | 1c19f98d2bb59ba50d0a5e1fd9aaa49c1c6757a0 (diff) |
drm/msm: add moduleparam to disable fbdev
Useful to avoid recompiling to disable fbdev. Useful because otherwise
the first modeset happens under console_lock (ie. debugging sadness).
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm')
-rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index e757c9d866db..a4269119f9ea 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c | |||
@@ -54,6 +54,12 @@ module_param(reglog, bool, 0600); | |||
54 | #define reglog 0 | 54 | #define reglog 0 |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | #ifdef CONFIG_DRM_MSM_FBDEV | ||
58 | static bool fbdev = true; | ||
59 | MODULE_PARM_DESC(fbdev, "Enable fbdev compat layer"); | ||
60 | module_param(fbdev, bool, 0600); | ||
61 | #endif | ||
62 | |||
57 | static char *vram = "16m"; | 63 | static char *vram = "16m"; |
58 | MODULE_PARM_DESC(vram, "Configure VRAM size (for devices without IOMMU/GPUMMU"); | 64 | MODULE_PARM_DESC(vram, "Configure VRAM size (for devices without IOMMU/GPUMMU"); |
59 | module_param(vram, charp, 0); | 65 | module_param(vram, charp, 0); |
@@ -300,7 +306,8 @@ static int msm_load(struct drm_device *dev, unsigned long flags) | |||
300 | drm_mode_config_reset(dev); | 306 | drm_mode_config_reset(dev); |
301 | 307 | ||
302 | #ifdef CONFIG_DRM_MSM_FBDEV | 308 | #ifdef CONFIG_DRM_MSM_FBDEV |
303 | priv->fbdev = msm_fbdev_init(dev); | 309 | if (fbdev) |
310 | priv->fbdev = msm_fbdev_init(dev); | ||
304 | #endif | 311 | #endif |
305 | 312 | ||
306 | ret = msm_debugfs_late_init(dev); | 313 | ret = msm_debugfs_late_init(dev); |