On 10/30/2015 11:38 AM, Daniel Vetter wrote: > On Thu, Oct 29, 2015 at 02:02:29PM +0100, Vincent Abriou wrote: >> DRM_STI_FBDEV is removed and replaced by the fbdev module param. >> By default, the fbdev compatibility is disabled. >> >> Signed-off-by: Vincent Abriou <vincent.abriou@xxxxxx> >> Signed-off-by: Nicolas VANHAELEWYN <nicolas.vanhaelewyn@xxxxxx> > > Already replied somewhere else, but we have this in the core fb helpers > with drm_kms_helper.fbdev_emulation module option. Just make sure that one > works for sti. > -Daniel > I was not aware about this. fbdev_emulation module option works fine for sti driver. This patch could be abandonned Thanks Vincent >> --- >> drivers/gpu/drm/sti/Kconfig | 6 ------ >> drivers/gpu/drm/sti/sti_drv.c | 15 ++++++++++----- >> 2 files changed, 10 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig >> index 0a9048c..3f8d590 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 e19c173..d47b025 100644 >> --- a/drivers/gpu/drm/sti/sti_drv.c >> +++ b/drivers/gpu/drm/sti/sti_drv.c >> @@ -30,6 +30,11 @@ >> #define STI_MAX_FB_HEIGHT 4096 >> #define STI_MAX_FB_WIDTH 4096 >> >> +/* Module parameter to enable fbdev compatibility */ >> +static bool fbdev_enabled; >> +MODULE_PARM_DESC(fbdev, "Enable fbdev compatibility layer"); >> +module_param_named(fbdev, fbdev_enabled, bool, 0644); >> + >> static void sti_atomic_schedule(struct sti_private *private, >> struct drm_atomic_state *state) >> { >> @@ -160,11 +165,11 @@ 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 >> + if (fbdev_enabled) >> + drm_fbdev_cma_init(dev, 32, >> + dev->mode_config.num_crtc, >> + dev->mode_config.num_connector); >> + >> return 0; >> } >> >> -- >> 1.9.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@xxxxxxxxxxxxxxxxxxxxx >> http://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel