| Message ID | 1425980493-27533-7-git-send-email-architt@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
I was close the send a patch it remove this flag but more inspired by what Rob has done few weeks ago: http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-next&id=e90dfec78ec288d6c89a7b508a5c5d4ae8b7f934 2015-03-10 10:41 GMT+01:00 Archit Taneja <architt@codeaurora.org>: > DRM_STI_FBDEV config is currently used to enable/disable fbdev emulation > for > the sti kms driver. > > Remove this local config option and use the top level DRM_FBDEV_EMULATION > config > option instead where applicable. > > We replace the #ifdef in sti_drm_load with CONFIG_DRM_FBDEV_EMULATION. It's > probably okay to get remove the #ifdef itself, but just left it here for > now to > be safe. It can be removed after some testing. > > Signed-off-by: Archit Taneja <architt@codeaurora.org> > --- > drivers/gpu/drm/sti/Kconfig | 6 ------ > drivers/gpu/drm/sti/sti_drm_drv.c | 2 +- > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig > index fbccc10..e3aa5af 100644 > --- a/drivers/gpu/drm/sti/Kconfig > +++ b/drivers/gpu/drm/sti/Kconfig > @@ -9,9 +9,3 @@ config DRM_STI > select FW_LOADER_USER_HELPER_FALLBACK > help > Choose this option to enable DRM on STM stiH41x chipset > - > -config DRM_STI_FBDEV > - bool "DRM frame buffer device for STMicroelectronics SoC stiH41x > Serie" > - depends on DRM_STI > - help > - Choose this option to enable FBDEV on top of DRM for STM stiH41x > chipset > diff --git a/drivers/gpu/drm/sti/sti_drm_drv.c > b/drivers/gpu/drm/sti/sti_drm_drv.c > index 5239fa1..90f121d 100644 > --- a/drivers/gpu/drm/sti/sti_drm_drv.c > +++ b/drivers/gpu/drm/sti/sti_drm_drv.c > @@ -76,7 +76,7 @@ static int sti_drm_load(struct drm_device *dev, unsigned > long flags) > > drm_helper_disable_unused_functions(dev); > > -#ifdef CONFIG_DRM_STI_FBDEV > +#ifdef CONFIG_DRM_FBDEV_EMULATION > drm_fbdev_cma_init(dev, 32, > dev->mode_config.num_crtc, > dev->mode_config.num_connector); > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > hosted by The Linux Foundation > >
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig index fbccc10..e3aa5af 100644 --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -9,9 +9,3 @@ config DRM_STI select FW_LOADER_USER_HELPER_FALLBACK help Choose this option to enable DRM on STM stiH41x chipset - -config DRM_STI_FBDEV - bool "DRM frame buffer device for STMicroelectronics SoC stiH41x Serie" - depends on DRM_STI - help - Choose this option to enable FBDEV on top of DRM for STM stiH41x chipset diff --git a/drivers/gpu/drm/sti/sti_drm_drv.c b/drivers/gpu/drm/sti/sti_drm_drv.c index 5239fa1..90f121d 100644 --- a/drivers/gpu/drm/sti/sti_drm_drv.c +++ b/drivers/gpu/drm/sti/sti_drm_drv.c @@ -76,7 +76,7 @@ static int sti_drm_load(struct drm_device *dev, unsigned long flags) drm_helper_disable_unused_functions(dev); -#ifdef CONFIG_DRM_STI_FBDEV +#ifdef CONFIG_DRM_FBDEV_EMULATION drm_fbdev_cma_init(dev, 32, dev->mode_config.num_crtc, dev->mode_config.num_connector);
DRM_STI_FBDEV config is currently used to enable/disable fbdev emulation for the sti kms driver. Remove this local config option and use the top level DRM_FBDEV_EMULATION config option instead where applicable. We replace the #ifdef in sti_drm_load with CONFIG_DRM_FBDEV_EMULATION. It's probably okay to get remove the #ifdef itself, but just left it here for now to be safe. It can be removed after some testing. Signed-off-by: Archit Taneja <architt@codeaurora.org> --- drivers/gpu/drm/sti/Kconfig | 6 ------ drivers/gpu/drm/sti/sti_drm_drv.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)