[PATCH v3 1/3] DSS2: Allow FB_OMAP2 to build without VRFB

[PATCH v3 1/3] DSS2: Allow FB_OMAP2 to build without VRFB

[Guruswamy Senthilvadivu]

From: Senthilvadivu Guruswamy <svadivu@ti.com>

FB_OMAP2 can work without VRFB, but currently does not build. Fix this.

Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
 arch/arm/plat-omap/include/plat/vrfb.h |   16 ++++++++++++++++
 1 file changed, 16 insertions(+), 0 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 */
-- 
1.5.4.7

[PATCH v3 2/3] DSS2: make VRFB depends on OMAP2,3

[Guruswamy Senthilvadivu]

From: Senthilvadivu Guruswamy <svadivu@ti.com>

config VRFB should depend on ARCH_OMAP2 or ARCH_OMAP3.

Changes from v1:
	- Addressed multi-omap build issue

Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
 drivers/video/omap2/Kconfig            |    4 ++++
 drivers/video/omap2/omapfb/Kconfig     |    1 -
 2 files changed,  4 insertions(+), 1 deletions(-)

diff --git a/drivers/video/omap2/Kconfig b/drivers/video/omap2/Kconfig
index d877c36..18bb835 100644
--- a/drivers/video/omap2/Kconfig
+++ b/drivers/video/omap2/Kconfig
@@ -3,6 +3,10 @@ config OMAP2_VRAM
 
 config OMAP2_VRFB
 	bool
+	depends on ARCH_OMAP2 || ARCH_OMAP3
+	default y if FB_OMAP2
+	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 a3ed15c..f186c2b 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

[PATCH v3 3/3] DSS2 FB Allow usage of def_vrfb only for omap2,3

[Guruswamy Senthilvadivu]

From: Senthilvadivu Guruswamy <svadivu@ti.com>

Changes since v2:
	Added a check to warn the wrong usage of vrfb in non-vrfb omap devices.

Force def_vrfb to 0 for non omap2, omap3 devices

Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
---
 drivers/video/omap2/omapfb/omapfb-main.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 4b4506d..0f79db8 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2128,6 +2128,16 @@ static int omapfb_probe(struct platform_device *pdev)
 		goto err0;
 	}
 
+	/* TODO : Replace cpu check with omap_has_vrfb once HAS_FEATURE
+	*	 available for OMAP2 and OMAP3
+	*/
+	if (def_vrfb && (!cpu_is_omap24xx()) && (!cpu_is_omap34xx())) {
+		def_vrfb = 0;
+		dev_warn(&pdev->dev, "VRFB is not in this device,"
+				"using DMA for rotation\n");
+	}
+
+
 	mutex_init(&fbdev->mtx);
 
 	fbdev->dev = &pdev->dev;
-- 
1.6.3.3

RE: [PATCH v3 3/3] DSS2 FB Allow usage of def_vrfb only for omap2,3

[Guruswamy, Senthilvadivu]

Tomi, 

> -----Original Message-----
> From: Guruswamy, Senthilvadivu 
> Sent: Thursday, June 10, 2010 4:54 PM
> To: linux-omap@vger.kernel.org; linux-fbdev@vger.kernel.org; 
> tony@atomide.com; tomi.valkeinen@nokia.com; Hiremath, Vaibhav
> Cc: Guruswamy, Senthilvadivu
> Subject: [PATCH v3 3/3] DSS2 FB Allow usage of def_vrfb only 
> for omap2,3
> 
> From: Senthilvadivu Guruswamy <svadivu@ti.com>
> 
> Changes since v2:
> 	Added a check to warn the wrong usage of vrfb in 
> non-vrfb omap devices.
> 
> Force def_vrfb to 0 for non omap2, omap3 devices
> 
> Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
> ---
>  drivers/video/omap2/omapfb/omapfb-main.c |   10 ++++++++++
>  1 files changed, 10 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/video/omap2/omapfb/omapfb-main.c 
> b/drivers/video/omap2/omapfb/omapfb-main.c
> index 4b4506d..0f79db8 100644
> --- a/drivers/video/omap2/omapfb/omapfb-main.c
> +++ b/drivers/video/omap2/omapfb/omapfb-main.c
> @@ -2128,6 +2128,16 @@ static int omapfb_probe(struct 
> platform_device *pdev)
>  		goto err0;
>  	}
>  
> +	/* TODO : Replace cpu check with omap_has_vrfb once HAS_FEATURE
> +	*	 available for OMAP2 and OMAP3
> +	*/
> +	if (def_vrfb && (!cpu_is_omap24xx()) && (!cpu_is_omap34xx())) {
> +		def_vrfb = 0;
> +		dev_warn(&pdev->dev, "VRFB is not in this device,"
> +				"using DMA for rotation\n");
> +	}
> +
> +
>  	mutex_init(&fbdev->mtx);
>
[Senthil]  All the comments received are incorporated in this v3.
I don't see any more comments on this patch series.  Is it
fine for you to take up this series of patches?
>  	fbdev->dev = &pdev->dev;
> -- 
> 1.6.3.3
> 
> 

Re: [PATCH v3 2/3] DSS2: make VRFB depends on OMAP2,3

[Tomi Valkeinen]

Hi,

On Thu, 2010-06-10 at 13:23 +0200, ext Guruswamy Senthilvadivu wrote:
> From: Senthilvadivu Guruswamy <svadivu@ti.com>
> 
> config VRFB should depend on ARCH_OMAP2 or ARCH_OMAP3.
> 
> Changes from v1:
> 	- Addressed multi-omap build issue

Did you mean the VRFB config option to be visible via Kconfig? It
doesn't show there.

Please use the same patch subject as the other dss patches (applies to
other patches in this set also):

OMAP: DSS2: <subsys>: foobar

Don't add changelogs into the patch message.

 Tomi

RE: [PATCH v3 2/3] DSS2: make VRFB depends on OMAP2,3

[Guruswamy, Senthilvadivu]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 1233 bytes --]

 
> 
> Hi,
> 
> On Thu, 2010-06-10 at 13:23 +0200, ext Guruswamy Senthilvadivu wrote:
> > From: Senthilvadivu Guruswamy <svadivu@ti.com>
> > 
> > config VRFB should depend on ARCH_OMAP2 or ARCH_OMAP3.
> > 
> > Changes from v1:
> > 	- Addressed multi-omap build issue
> 
> Did you mean the VRFB config option to be visible via Kconfig? It
> doesn't show there.
[Senthil]  Previously VRFB was default selected if OMAP_FB irresepective of ARCH.
Now it is made to be selected by default in case of ARCH_OMAP2,3 and OMAP_FB.
The option does not show up in menuconfig as before.  

I see that it is good not to show up as before this patch because
1.  if it shows up then user would unknowingly select for non omap2,3 also which is not applicable.
2.  it gets selected by default in the needed case without the need to show up in the menuconfig. Ie omap2,3 and OMAP_FB. 
 
> Please use the same patch subject as the other dss patches (applies to
> other patches in this set also):
> 
> OMAP: DSS2: <subsys>: foobar
[Senthil] Okay

> Don't add changelogs into the patch message.
> 
[Senthil] Okay
>  Tomi
> 
> 
> ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±ýöÝzÿâžØ^n‡r¡ö¦zË\x1aëh™¨è­Ú&£ûàz¿äz¹Þ—ú+€Ê+zf£¢·hšˆ§~†­†Ûiÿÿïêÿ‘êçz_è®\x0fæj:+v‰¨þ)ߣøm