leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/msm: Remove local fbdev emulation Kconfig option

Browse Source 
DRM_MSM_FBDEV config is used to enable/disable fbdev emulation for the
msm kms driver.

Replace this with the top level DRM_FBDEV_EMULATION config option where
applicable. This also prevents build breaks caused by undefined
drm_fb_helper_* functions when legacy fbdev support was disabled.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Archit Taneja 2015-07-13 12:12:07 +05:30 committed by Rob Clark
parent d879eb5ad5
commit a9ee34b70e
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/msm/Kconfig
View File

@ -14,20 +14,6 @@ config DRM_MSM
help help
DRM/KMS driver for MSM/snapdragon. DRM/KMS driver for MSM/snapdragon.
config DRM_MSM_FBDEV
bool "Enable legacy fbdev support for MSM modesetting driver"
depends on DRM_MSM
select DRM_KMS_FB_HELPER
select FB_SYS_FILLRECT
select FB_SYS_COPYAREA
select FB_SYS_IMAGEBLIT
select FB_SYS_FOPS
default y
help
Choose this option if you have a need for the legacy fbdev
support. Note that this support also provide the linux console
support on top of the MSM modesetting driver.
config DRM_MSM_REGISTER_LOGGING config DRM_MSM_REGISTER_LOGGING
bool "MSM DRM register logging" bool "MSM DRM register logging"
depends on DRM_MSM depends on DRM_MSM

2
drivers/gpu/drm/msm/Makefile
View File

@ -50,7 +50,7 @@ msm-y := \
msm_rd.o \ msm_rd.o \
msm_ringbuffer.o msm_ringbuffer.o
msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o
msm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi.o \ msm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi.o \

8
drivers/gpu/drm/msm/msm_drv.c
View File

@ -21,11 +21,9 @@
static void msm_fb_output_poll_changed(struct drm_device *dev) static void msm_fb_output_poll_changed(struct drm_device *dev)
{ {
#ifdef CONFIG_DRM_MSM_FBDEV
struct msm_drm_private *priv = dev->dev_private; struct msm_drm_private *priv = dev->dev_private;
if (priv->fbdev) if (priv->fbdev)
drm_fb_helper_hotplug_event(priv->fbdev); drm_fb_helper_hotplug_event(priv->fbdev);
#endif
} }
static const struct drm_mode_config_funcs mode_config_funcs = { static const struct drm_mode_config_funcs mode_config_funcs = {
@ -56,7 +54,7 @@ module_param(reglog, bool, 0600);
#define reglog 0 #define reglog 0
#endif #endif
#ifdef CONFIG_DRM_MSM_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
static bool fbdev = true; static bool fbdev = true;
MODULE_PARM_DESC(fbdev, "Enable fbdev compat layer"); MODULE_PARM_DESC(fbdev, "Enable fbdev compat layer");
module_param(fbdev, bool, 0600); module_param(fbdev, bool, 0600);
@ -423,7 +421,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
drm_mode_config_reset(dev); drm_mode_config_reset(dev);
#ifdef CONFIG_DRM_MSM_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
if (fbdev) if (fbdev)
priv->fbdev = msm_fbdev_init(dev); priv->fbdev = msm_fbdev_init(dev);
#endif #endif
@ -491,11 +489,9 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)
static void msm_lastclose(struct drm_device *dev) static void msm_lastclose(struct drm_device *dev)
{ {
#ifdef CONFIG_DRM_MSM_FBDEV
struct msm_drm_private *priv = dev->dev_private; struct msm_drm_private *priv = dev->dev_private;
if (priv->fbdev) if (priv->fbdev)
drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev); drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
#endif
} }
static irqreturn_t msm_irq(int irq, void *arg) static irqreturn_t msm_irq(int irq, void *arg)