linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] DSS2 Include VRFB into omap2-3build only
@ 2010-05-10  6:48 Senthilvadivu Guruswamy
  2010-05-10  7:39 ` Koen Kooi
  0 siblings, 1 reply; 11+ messages in thread
From: Senthilvadivu Guruswamy @ 2010-05-10  6:48 UTC (permalink / raw)
  To: linux-omap, linux-fbdev-devel, tony, tomi.valkeinen, v-hiremath
  Cc: Senthilvadivu Guruswamy

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 <svadivu@ti.com>
---
 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


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2010-06-21  8:50 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-10  6:48 [PATCH] DSS2 Include VRFB into omap2-3build only Senthilvadivu Guruswamy
2010-05-10  7:39 ` Koen Kooi
2010-05-10  8:01   ` Guruswamy, Senthilvadivu
2010-05-10  8:03     ` Koen Kooi
2010-05-10  8:38       ` Guruswamy, Senthilvadivu
2010-05-10 11:24         ` Nishanth Menon
2010-05-10 13:12           ` Nishanth Menon
2010-05-10 17:14             ` Tony Lindgren
2010-06-18 16:57       ` Aguirre, Sergio
2010-06-21  8:38         ` Tomi Valkeinen
2010-06-21  8:50           ` Guruswamy, Senthilvadivu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).