diff mbox

[13/15] fbdev: sh-mobile-lcdcfb: Enable driver compilation with COMPILE_TEST

Message ID 1385515117-23664-14-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State New, archived
Headers show

Commit Message

Laurent Pinchart Nov. 27, 2013, 1:18 a.m. UTC 
This helps increasing build testing coverage.

Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Simon Horman <horms@verge.net.au>
---
 drivers/video/Kconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Laurent Pinchart Dec. 11, 2013, 12:51 p.m. UTC | #1 
Hi Jean-Christophe and Tomi,

Could you please pick this patch up for v3.14 ?

On Wednesday 27 November 2013 02:18:35 Laurent Pinchart wrote:
> This helps increasing build testing coverage.
> 
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: linux-fbdev@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Acked-by: Simon Horman <horms@verge.net.au>
> ---
>  drivers/video/Kconfig | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index 4f2e1b3..2aceb08 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -10,7 +10,8 @@ config HAVE_FB_ATMEL
> 
>  config SH_MIPI_DSI
>  	tristate
> -	depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
> +	depends on HAVE_CLK
> +	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
> 
>  config SH_LCD_MIPI_DSI
>  	bool
> @@ -1997,7 +1998,8 @@ config FB_W100
> 
>  config FB_SH_MOBILE_LCDC
>  	tristate "SuperH Mobile LCDC framebuffer support"
> -	depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
> +	depends on FB && HAVE_CLK
> +	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
>  	select FB_SYS_FILLRECT
>  	select FB_SYS_COPYAREA
>  	select FB_SYS_IMAGEBLIT
> @@ -2484,7 +2486,7 @@ endif
> 
>  config FB_SH_MOBILE_MERAM
>  	tristate "SuperH Mobile MERAM read ahead support"
> -	depends on (SUPERH || ARCH_SHMOBILE)
> +	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
>  	select GENERIC_ALLOCATOR
>  	---help---
>  	  Enable MERAM support for the SuperH controller.
Laurent Pinchart Jan. 7, 2014, 3:15 p.m. UTC | #2 
On Wednesday 11 December 2013 13:51:18 Laurent Pinchart wrote:
> Hi Jean-Christophe and Tomi,
> 
> Could you please pick this patch up for v3.14 ?

Ping ?

> On Wednesday 27 November 2013 02:18:35 Laurent Pinchart wrote:
> > This helps increasing build testing coverage.
> > 
> > Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> > Cc: linux-fbdev@vger.kernel.org
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > Acked-by: Simon Horman <horms@verge.net.au>
> > ---
> > 
> >  drivers/video/Kconfig | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> > index 4f2e1b3..2aceb08 100644
> > --- a/drivers/video/Kconfig
> > +++ b/drivers/video/Kconfig
> > @@ -10,7 +10,8 @@ config HAVE_FB_ATMEL
> > 
> >  config SH_MIPI_DSI
> >  	tristate
> > -	depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
> > +	depends on HAVE_CLK
> > +	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
> > 
> >  config SH_LCD_MIPI_DSI
> >  	bool
> > @@ -1997,7 +1998,8 @@ config FB_W100
> > 
> >  config FB_SH_MOBILE_LCDC
> >  	tristate "SuperH Mobile LCDC framebuffer support"
> > -	depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
> > +	depends on FB && HAVE_CLK
> > +	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
> >  	select FB_SYS_FILLRECT
> >  	select FB_SYS_COPYAREA
> >  	select FB_SYS_IMAGEBLIT
> > @@ -2484,7 +2486,7 @@ endif
> > 
> >  config FB_SH_MOBILE_MERAM
> >  	tristate "SuperH Mobile MERAM read ahead support"
> > -	depends on (SUPERH || ARCH_SHMOBILE)
> > +	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
> >  	select GENERIC_ALLOCATOR
> >  	---help---
> >  	  Enable MERAM support for the SuperH controller.
Tomi Valkeinen Jan. 8, 2014, 8:30 a.m. UTC | #3 
On 2014-01-07 17:15, Laurent Pinchart wrote:
> On Wednesday 11 December 2013 13:51:18 Laurent Pinchart wrote:
>> Hi Jean-Christophe and Tomi,
>>
>> Could you please pick this patch up for v3.14 ?
> 
> Ping ?

Queued for 3.14.

 Tomi
Tomi Valkeinen Jan. 17, 2014, 9 a.m. UTC | #4 
Hi,

On 2014-01-08 10:30, Tomi Valkeinen wrote:
> On 2014-01-07 17:15, Laurent Pinchart wrote:
>> On Wednesday 11 December 2013 13:51:18 Laurent Pinchart wrote:
>>> Hi Jean-Christophe and Tomi,
>>>
>>> Could you please pick this patch up for v3.14 ?
>>
>> Ping ?
> 
> Queued for 3.14.

I'll drop this patch, as it causes compile break (from kbuild test robot):

All error/warnings:

   drivers/built-in.o: In function `sh_mobile_lcdc_pan':
>> sh_mobile_lcdcfb.c:(.text+0x77373): undefined reference to
`sh_mobile_meram_cache_update'
   drivers/built-in.o: In function `sh_mobile_lcdc_start':
>> sh_mobile_lcdcfb.c:(.text+0x79320): undefined reference to
`sh_mobile_meram_cache_free'
>> sh_mobile_lcdcfb.c:(.text+0x79394): undefined reference to
`sh_mobile_meram_cache_alloc'
>> sh_mobile_lcdcfb.c:(.text+0x793d4): undefined reference to
`sh_mobile_meram_cache_update'
   drivers/built-in.o: In function `sh_mobile_lcdc_stop':
>> sh_mobile_lcdcfb.c:(.text+0x79616): undefined reference to
`sh_mobile_meram_cache_free'

 Tomi
Laurent Pinchart Jan. 19, 2014, 9:01 p.m. UTC | #5 
Hi Tomi,

On Friday 17 January 2014 11:00:58 Tomi Valkeinen wrote:
> Hi,
> 
> On 2014-01-08 10:30, Tomi Valkeinen wrote:
> > On 2014-01-07 17:15, Laurent Pinchart wrote:
> >> On Wednesday 11 December 2013 13:51:18 Laurent Pinchart wrote:
> >>> Hi Jean-Christophe and Tomi,
> >>> 
> >>> Could you please pick this patch up for v3.14 ?
> >> 
> >> Ping ?
> > 
> > Queued for 3.14.
> 
> I'll drop this patch, as it causes compile break (from kbuild test robot):
> 
> All error/warnings:
> 
>    drivers/built-in.o: In function `sh_mobile_lcdc_pan':
> >> sh_mobile_lcdcfb.c:(.text+0x77373): undefined reference to
> `sh_mobile_meram_cache_update'
>    drivers/built-in.o: In function `sh_mobile_lcdc_start':
> >> sh_mobile_lcdcfb.c:(.text+0x79320): undefined reference to
> `sh_mobile_meram_cache_free'
> >> sh_mobile_lcdcfb.c:(.text+0x79394): undefined reference to
> `sh_mobile_meram_cache_alloc'
> >> sh_mobile_lcdcfb.c:(.text+0x793d4): undefined reference to
> `sh_mobile_meram_cache_update'
>    drivers/built-in.o: In function `sh_mobile_lcdc_stop':
> >> sh_mobile_lcdcfb.c:(.text+0x79616): undefined reference to
> `sh_mobile_meram_cache_free'

The lcdc driver can be compiled without meram support. This is handled by 
conditional compilation in include/video/sh_mobile_meram.h that defines the 
meram functions as stubs when meram support isn't selected.

The problem comes from the combination of FB_SH_MOBILE_MERAM=m and 
FB_SH_MOBILE_LCDC=y. The former makes the meram function non-stubs, while the 
later makes the LCDC driver fail to link, as meram support is then compiled as 
a module.

How do you usually handle this ?
Tomi Valkeinen Jan. 20, 2014, 11:21 a.m. UTC | #6 
On 2014-01-19 23:01, Laurent Pinchart wrote:
> Hi Tomi,

> The lcdc driver can be compiled without meram support. This is handled by 
> conditional compilation in include/video/sh_mobile_meram.h that defines the 
> meram functions as stubs when meram support isn't selected.
> 
> The problem comes from the combination of FB_SH_MOBILE_MERAM=m and 
> FB_SH_MOBILE_LCDC=y. The former makes the meram function non-stubs, while the 
> later makes the LCDC driver fail to link, as meram support is then compiled as 
> a module.
> 
> How do you usually handle this ?

I guess the easiest option is to make FB_SH_MOBILE_MERAM a bool, instead
of tristate.

 Tomi
Laurent Pinchart Jan. 20, 2014, 3:30 p.m. UTC | #7 
Hi Tomi,

On Monday 20 January 2014 13:21:47 Tomi Valkeinen wrote:
> On 2014-01-19 23:01, Laurent Pinchart wrote:
> > Hi Tomi,
> > 
> > The lcdc driver can be compiled without meram support. This is handled by
> > conditional compilation in include/video/sh_mobile_meram.h that defines
> > the
> > meram functions as stubs when meram support isn't selected.
> > 
> > The problem comes from the combination of FB_SH_MOBILE_MERAM=m and
> > FB_SH_MOBILE_LCDC=y. The former makes the meram function non-stubs, while
> > the later makes the LCDC driver fail to link, as meram support is then
> > compiled as a module.
> > 
> > How do you usually handle this ?
> 
> I guess the easiest option is to make FB_SH_MOBILE_MERAM a bool, instead
> of tristate.

That's easy, but it would prevent meram support from being compiled as a 
module when lcdc support is compiled as a module as well.
diff mbox

Patch

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4f2e1b3..2aceb08 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -10,7 +10,8 @@  config HAVE_FB_ATMEL
 
 config SH_MIPI_DSI
 	tristate
-	depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
+	depends on HAVE_CLK
+	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
 
 config SH_LCD_MIPI_DSI
 	bool
@@ -1997,7 +1998,8 @@  config FB_W100
 
 config FB_SH_MOBILE_LCDC
 	tristate "SuperH Mobile LCDC framebuffer support"
-	depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
+	depends on FB && HAVE_CLK
+	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
 	select FB_SYS_FILLRECT
 	select FB_SYS_COPYAREA
 	select FB_SYS_IMAGEBLIT
@@ -2484,7 +2486,7 @@  endif
 
 config FB_SH_MOBILE_MERAM
 	tristate "SuperH Mobile MERAM read ahead support"
-	depends on (SUPERH || ARCH_SHMOBILE)
+	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
 	select GENERIC_ALLOCATOR
 	---help---
 	  Enable MERAM support for the SuperH controller.