[PATCH] DSS2 Include VRFB into omap2-3build only

Exclude VRFB from OMAP4 onwards and include only for
OMAP2 and OMAP3 builds.  In OMAP4 VRFB HW IP is replaced
with a new HW IP "TILER"

Signed-off-by: Senthilvadivu Guruswamy <redacted>
---
 arch/arm/plat-omap/include/plat/vrfb.h |   16 ++++++++++++++++
 drivers/video/omap2/Kconfig            |    4 ++++
 drivers/video/omap2/omapfb/Kconfig     |    1 -
 3 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/vrfb.h b/arch/arm/plat-omap/include/plat/vrfb.h
index d8a03ce..3792bde 100644
--- a/arch/arm/plat-omap/include/plat/vrfb.h
+++ b/arch/arm/plat-omap/include/plat/vrfb.h

@@ -35,6 +35,7 @@ struct vrfb {
 	bool yuv_mode;
 };
 
+#ifdef CONFIG_OMAP2_VRFB
 extern int omap_vrfb_request_ctx(struct vrfb *vrfb);
 extern void omap_vrfb_release_ctx(struct vrfb *vrfb);
 extern void omap_vrfb_adjust_size(u16 *width, u16 *height,

@@ -47,4 +48,19 @@ extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
 extern int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot);
 extern void omap_vrfb_restore_context(void);
 
+#else
+static inline int omap_vrfb_request_ctx(struct vrfb *vrfb) { return 0; }
+static inline void omap_vrfb_release_ctx(struct vrfb *vrfb) {}
+static inline void omap_vrfb_adjust_size(u16 *width, u16 *height,
+		u8 bytespp) {}
+static inline u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp)
+		{ return 0; }
+static inline u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp)
+		{ return 0; }
+static inline void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
+		u16 width, u16 height, unsigned bytespp, bool yuv_mode) {}
+static inline int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot)
+		{ return 0; }
+static inline void omap_vrfb_restore_context(void) {}
+#endif
 #endif /* __VRFB_H */

diff --git a/drivers/video/omap2/Kconfig b/drivers/video/omap2/Kconfig
index d877c36..253376a 100644
--- a/drivers/video/omap2/Kconfig
+++ b/drivers/video/omap2/Kconfig

@@ -3,6 +3,10 @@ config OMAP2_VRAM
 
 config OMAP2_VRFB
 	bool
+	depends on FB_OMAP2 && (!ARCH_OMAP4)
+	default y if (ARCH_OMAP2 || ARCH_OMAP3)
+	help
+	  OMAP VRFB buffer support is efficient for rotation
 
 source "drivers/video/omap2/dss/Kconfig"
 source "drivers/video/omap2/omapfb/Kconfig"

diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 43496d6..fee537e 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig

@@ -3,7 +3,6 @@ menuconfig FB_OMAP2
         depends on FB && OMAP2_DSS
 
 	select OMAP2_VRAM
-	select OMAP2_VRFB
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT

-- 
1.5.4.7

Op 10 mei 2010, om 08:48 heeft Senthilvadivu Guruswamy het volgende geschreven:

How does this work for multi-omap kernels, e.g. building a kernel with beagle and panda support?

regards,

Koen

Building a multi-omap kernel is not impacted as long as the display is not choosen in the build.  Usually display is chosen from the board file.

-----Original Message-----
From: Koen Kooi [mailto:<redacted>] 
Sent: Monday, May 10, 2010 1:10 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>; 
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com; 
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 08:48 heeft Senthilvadivu Guruswamy het 
volgende geschreven:

quoted

Exclude VRFB from OMAP4 onwards and include only for
OMAP2 and OMAP3 builds.  In OMAP4 VRFB HW IP is replaced
with a new HW IP "TILER"

--- a/drivers/video/omap2/Kconfig
+++ b/drivers/video/omap2/Kconfig

@@ -3,6 +3,10 @@ config OMAP2_VRAM

config OMAP2_VRFB
	bool
+	depends on FB_OMAP2 && (!ARCH_OMAP4)
+	default y if (ARCH_OMAP2 || ARCH_OMAP3)
+	help
+	  OMAP VRFB buffer support is efficient for rotation

How does this work for multi-omap kernels, e.g. building a 
kernel with beagle and panda support?

regards,

Koen

Op 10 mei 2010, om 10:01 heeft Guruswamy, Senthilvadivu het volgende geschreven:

Building a multi-omap kernel is not impacted as long as the display is not choosen in the build.  Usually display is chosen from the board file.

So you are saying it *IS* broken when wanting vrfb on omap3 and tiler on omap4, right?

quoted

-----Original Message-----
From: Koen Kooi [mailto:<redacted>] 
Sent: Monday, May 10, 2010 1:10 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>; 
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com; 
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 08:48 heeft Senthilvadivu Guruswamy het 
volgende geschreven:

quoted

Exclude VRFB from OMAP4 onwards and include only for
OMAP2 and OMAP3 builds.  In OMAP4 VRFB HW IP is replaced
with a new HW IP "TILER"

--- a/drivers/video/omap2/Kconfig
+++ b/drivers/video/omap2/Kconfig

@@ -3,6 +3,10 @@ config OMAP2_VRAM

config OMAP2_VRFB
	bool
+	depends on FB_OMAP2 && (!ARCH_OMAP4)
+	default y if (ARCH_OMAP2 || ARCH_OMAP3)
+	help
+	  OMAP VRFB buffer support is efficient for rotation

How does this work for multi-omap kernels, e.g. building a 
kernel with beagle and panda support?

regards,

Koen

Tiler support is not yet in OMAP builds. So multi-omap build will NOT break, but would exclude VRFB feature in the build.

-----Original Message-----
From: Koen Kooi [mailto:<redacted>] 
Sent: Monday, May 10, 2010 1:33 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>; 
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com; 
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 10:01 heeft Guruswamy, Senthilvadivu het 
volgende geschreven:

quoted

Building a multi-omap kernel is not impacted as long as the 

display is not choosen in the build.  Usually display is 
chosen from the board file.

So you are saying it *IS* broken when wanting vrfb on omap3 
and tiler on omap4, right?

quoted

quoted

-----Original Message-----
From: Koen Kooi [mailto:<redacted>] 
Sent: Monday, May 10, 2010 1:10 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>; 
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com; 
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 08:48 heeft Senthilvadivu Guruswamy het 
volgende geschreven:

quoted

Exclude VRFB from OMAP4 onwards and include only for
OMAP2 and OMAP3 builds.  In OMAP4 VRFB HW IP is replaced
with a new HW IP "TILER"

19 more quoted lines

On 05/10/2010 03:26 AM, Guruswamy, Senthilvadivu wrote:

Tiler support is not yet in OMAP builds. So multi-omap build will NOT break, but would exclude VRFB feature in the build.

in which case, is'nt this patch redundant :) ?

joking apart, would'nt a set of function pointers be better - the 
function pointers could be runtime initialized. the rotational functions 
for Tiler OR vrfb could be used?

quoted

-----Original Message-----
From: Koen Kooi [mailto:<redacted>]
Sent: Monday, May 10, 2010 1:33 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>;
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com;
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 10:01 heeft Guruswamy, Senthilvadivu het
volgende geschreven:

quoted

Building a multi-omap kernel is not impacted as long as the

display is not choosen in the build.  Usually display is
chosen from the board file.

So you are saying it *IS* broken when wanting vrfb on omap3
and tiler on omap4, right?

quoted

quoted

-----Original Message-----
From: Koen Kooi [mailto:<redacted>]
Sent: Monday, May 10, 2010 1:10 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>;
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com;
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 08:48 heeft Senthilvadivu Guruswamy het
volgende geschreven:

quoted

Exclude VRFB from OMAP4 onwards and include only for
OMAP2 and OMAP3 builds.  In OMAP4 VRFB HW IP is replaced
with a new HW IP "TILER"

24 more quoted lines

Regards,
Nishanth Menon

On 05/10/2010 06:24 AM, Nishanth Menon wrote:

On 05/10/2010 03:26 AM, Guruswamy, Senthilvadivu wrote:

quoted

Tiler support is not yet in OMAP builds. So multi-omap build will NOT break, but would exclude VRFB feature in the build.

in which case, is'nt this patch redundant :) ?

joking apart, would'nt a set of function pointers be better - the
function pointers could be runtime initialized. the rotational functions
for Tiler OR vrfb could be used?

just an addon -> I can see one more potential user of the FEATURES 
framework like dma descriptor feature.. what kind of rotator do we have? 
vrfb Vs tiler..

quoted

quoted

-----Original Message-----
From: Koen Kooi [mailto:<redacted>]
Sent: Monday, May 10, 2010 1:33 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>;
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com;
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 10:01 heeft Guruswamy, Senthilvadivu het
volgende geschreven:

quoted

Building a multi-omap kernel is not impacted as long as the

display is not choosen in the build.  Usually display is
chosen from the board file.

So you are saying it *IS* broken when wanting vrfb on omap3
and tiler on omap4, right?

quoted

quoted

-----Original Message-----
From: Koen Kooi [mailto:<redacted>]
Sent: Monday, May 10, 2010 1:10 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>;
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com;
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 08:48 heeft Senthilvadivu Guruswamy het
volgende geschreven:

quoted

Exclude VRFB from OMAP4 onwards and include only for
OMAP2 and OMAP3 builds.  In OMAP4 VRFB HW IP is replaced

32 more quoted lines

* Nishanth Menon [off-list ref] [100510 06:07]:

On 05/10/2010 06:24 AM, Nishanth Menon wrote:

quoted

On 05/10/2010 03:26 AM, Guruswamy, Senthilvadivu wrote:

quoted

Tiler support is not yet in OMAP builds. So multi-omap build will NOT break, but would exclude VRFB feature in the build.

in which case, is'nt this patch redundant :) ?

joking apart, would'nt a set of function pointers be better - the
function pointers could be runtime initialized. the rotational functions
for Tiler OR vrfb could be used?

just an addon -> I can see one more potential user of the FEATURES
framework like dma descriptor feature.. what kind of rotator do we
have? vrfb Vs tiler..

Guys, let's make one thing clear: We want to make sure things compile
and boot with the omap3_defconfig for all mach-omap2 machines.

This means we must be able to compile in all the drivers (and panels)
without breaking other configurations. This is the standard Linux
behaviour. Any patches that break this will not get merged.

Also, please follow the mailing list etiquette, no more top posting:

http://www.elinux.org/Netiquette

Regards,

Tony

Senthil,

-----Original Message-----
From: <redacted> [mailto:linux-omap-
owner@vger.kernel.org] On Behalf Of Koen Kooi
Sent: Monday, May 10, 2010 3:03 AM
To: Guruswamy, Senthilvadivu
Cc: <redacted>; <redacted>;
tony@atomide.com; tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 10:01 heeft Guruswamy, Senthilvadivu het volgende
geschreven:

quoted

Building a multi-omap kernel is not impacted as long as the display is

not choosen in the build.  Usually display is chosen from the board file.

Solving this problem involves doing these selections in run time, NOT in build time.

One of the solutions for this is to provide all this selections as part
of some platform driver data.

It _should_ be possible to build DSS2, VRFB AND Tiler code at the same time
for a multi-omap build, and be executed selectively, depending on your
silicon detection and board code execution.

If you need to deselect it to succeed, then it's broken for multi-omap
builds. That's the core problem and it hasn't been addressed until date.

Regards,
Sergio

So you are saying it *IS* broken when wanting vrfb on omap3 and tiler on
omap4, right?

quoted

quoted

-----Original Message-----
From: Koen Kooi [mailto:<redacted>]
Sent: Monday, May 10, 2010 1:10 PM
To: Guruswamy, Senthilvadivu
Cc: <redacted>;
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com;
tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 08:48 heeft Senthilvadivu Guruswamy het
volgende geschreven:

quoted

Exclude VRFB from OMAP4 onwards and include only for
OMAP2 and OMAP3 builds.  In OMAP4 VRFB HW IP is replaced
with a new HW IP "TILER"

--- a/drivers/video/omap2/Kconfig
+++ b/drivers/video/omap2/Kconfig

@@ -3,6 +3,10 @@ config OMAP2_VRAM

config OMAP2_VRFB
	bool
+	depends on FB_OMAP2 && (!ARCH_OMAP4)
+	default y if (ARCH_OMAP2 || ARCH_OMAP3)
+	help
+	  OMAP VRFB buffer support is efficient for rotation

How does this work for multi-omap kernels, e.g. building a
kernel with beagle and panda support?

regards,

6 more quoted lines

On Fri, 2010-06-18 at 18:57 +0200, ext Aguirre, Sergio wrote:

Senthil,

quoted

-----Original Message-----
From: <redacted> [mailto:linux-omap-
owner@vger.kernel.org] On Behalf Of Koen Kooi
Sent: Monday, May 10, 2010 3:03 AM
To: Guruswamy, Senthilvadivu
Cc: <redacted>; <redacted>;
tony@atomide.com; tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 10:01 heeft Guruswamy, Senthilvadivu het volgende
geschreven:

quoted

Building a multi-omap kernel is not impacted as long as the display is

not choosen in the build.  Usually display is chosen from the board file.

Solving this problem involves doing these selections in run time, NOT in build time.

One of the solutions for this is to provide all this selections as part
of some platform driver data.

It _should_ be possible to build DSS2, VRFB AND Tiler code at the same time
for a multi-omap build, and be executed selectively, depending on your
silicon detection and board code execution.

If you need to deselect it to succeed, then it's broken for multi-omap
builds. That's the core problem and it hasn't been addressed until date.

I think the v3 patch set does it correctly. It allows VRFB to be built
only if ARCH_OMAP2 || ARCH_OMAP3, but does not turn VRFB off on
ARCH_OMAP4.

 Tomi

-----Original Message-----
From: Tomi Valkeinen [mailto:<redacted>] 
Sent: Monday, June 21, 2010 2:08 PM
To: Aguirre, Sergio
Cc: Koen Kooi; Guruswamy, Senthilvadivu; 
linux-omap@vger.kernel.org; 
linux-fbdev-devel@lists.sourceforge.net; tony@atomide.com; 
Hiremath, Vaibhav
Subject: RE: [PATCH] DSS2 Include VRFB into omap2-3build only

On Fri, 2010-06-18 at 18:57 +0200, ext Aguirre, Sergio wrote:

quoted

Senthil,

quoted

-----Original Message-----
From: <redacted> [mailto:linux-omap-
owner@vger.kernel.org] On Behalf Of Koen Kooi
Sent: Monday, May 10, 2010 3:03 AM
To: Guruswamy, Senthilvadivu
Cc: <redacted>; 

linux-fbdev-devel@lists.sourceforge.net;

quoted

quoted

tony@atomide.com; tomi.valkeinen@nokia.com; Hiremath, Vaibhav
Subject: Re: [PATCH] DSS2 Include VRFB into omap2-3build only


Op 10 mei 2010, om 10:01 heeft Guruswamy, Senthilvadivu 

het volgende

quoted

quoted

geschreven:

quoted

Building a multi-omap kernel is not impacted as long as 

the display is

quoted

quoted

not choosen in the build.  Usually display is chosen from 

the board file.

quoted

It _should_ be possible to build DSS2, VRFB AND Tiler code 

at the same time

quoted

for a multi-omap build, and be executed selectively, 

depending on your

quoted

silicon detection and board code execution.

If you need to deselect it to succeed, then it's broken for 

7 more quoted lines

[Senthil]  Sergio, the v3 patch allows VRFB in multi-omap build.  Runtime
VRFB usage is not allowed on omap4 device and is allowed for omap2,3.
Refer to v3 patch 3/3.