diff options
| author | Archit Taneja <architt@codeaurora.org> | 2015-10-27 11:10:58 +0300 |
|---|---|---|
| committer | Vincent Abriou <vincent.abriou@st.com> | 2015-11-03 15:04:55 +0300 |
| commit | b5d34a272d37c08612aaea9601ddd311757fd149 (patch) | |
| tree | dfe18a82ab31296fb0993d8787816b9fec807601 | |
| parent | cebd6fbeb2fc9e7c4f10f3656fe9f1ba863a8549 (diff) | |
| download | linux-b5d34a272d37c08612aaea9601ddd311757fd149.tar.xz | |
drm/sti: Remove local fbdev emulation Kconfig option
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 core fb helpers with
drm_kms_helper.fbdev_emulation module option to enable/disable fbdev
at runtime.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Reviewed-by: Vincent Abriou <vincent.abriou@st.com>
| -rw-r--r-- | drivers/gpu/drm/sti/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_drv.c | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig index 0a9048c47b95..3f8d590e5c34 100644 --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -10,9 +10,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_drv.c b/drivers/gpu/drm/sti/sti_drv.c index 105e7e54b2a7..45c637534d96 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -160,11 +160,10 @@ static int sti_load(struct drm_device *dev, unsigned long flags) drm_mode_config_reset(dev); -#ifdef CONFIG_DRM_STI_FBDEV drm_fbdev_cma_init(dev, 32, dev->mode_config.num_crtc, dev->mode_config.num_connector); -#endif + return 0; } |