[PATCH v3 2/3] drm/sti: Remove local fbdev emulation Kconfig option

[Archit Taneja]

Hi Vincent,

On 10/30/2015 6:00 PM, Vincent ABRIOU wrote:
> Hi Archit,
>
> I tested fbdev_emulation module param and it works fine for the sti driver.
> I will abandon my patch and integrate yours. And if you don't mind, I
> will update your patch to remove the #ifdef CONFIG_DRM_FBDEV_EMULATION.

Sure thing. Thanks for testing it.

Archit

>
> Thanks
> Vincent
>
> Reviewed-by: Vincent Abriou <vincent.abriou at st.com>
>
> On 10/30/2015 11:25 AM, Daniel Vetter wrote:
>> On Thu, Oct 29, 2015 at 02:33:02PM +0100, Vincent ABRIOU wrote:
>>> Hi,
>>>
>>> I am fine with your proposal to remove DRM_STI_FBDEV but I would like to
>>> be able to enable it by a module parameter. This is what I propose in
>>> "[PATCH 1/1] drm/sti: enable fbdev compatibility through module param"
>>
>> We already have support to enable/disable fbdev at runtime in the helper,
>> see
>>
>> commit f64c5573d253ab3f9c01b4056c5f75a889d18502
>> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
>> Date:   Tue Aug 25 15:45:13 2015 +0200
>>
>>       drm/fb-helper: Add module option to disable fbdev emulation
>>
>> Cheers, Daniel
>>>
>>> BR
>>> Vincent
>>>
>>> On 10/27/2015 09:10 AM, Archit Taneja wrote:
>>>> 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 at codeaurora.org>
>>>> ---
>>>>     drivers/gpu/drm/sti/Kconfig   | 6 ------
>>>>     drivers/gpu/drm/sti/sti_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_drv.c b/drivers/gpu/drm/sti/sti_drv.c
>>>> index f846996..1b2db6c 100644
>>>> --- a/drivers/gpu/drm/sti/sti_drv.c
>>>> +++ b/drivers/gpu/drm/sti/sti_drv.c
>>>> @@ -160,7 +160,7 @@ static int sti_load(struct drm_device *dev, unsigned long flags)
>>>>
>>>>     	drm_mode_config_reset(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);
>>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
>

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project