* [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB @ 2010-10-08 6:56 Guruswamy Senthilvadivu 2010-10-08 6:56 ` [PATCH v6 1/3] " Guruswamy Senthilvadivu 2010-10-08 9:52 ` [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build Tomi Valkeinen 0 siblings, 2 replies; 6+ messages in thread From: Guruswamy Senthilvadivu @ 2010-10-08 6:56 UTC (permalink / raw) To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy From: Senthilvadivu Guruswamy <svadivu@ti.com> The changelog till v6 are: - Address Multi-omap build issue - Added a check to warn the wrong usage of vrfb in non-vrfb omap devices. - The patch subject is as per the naming conventions - patch 2/3 now has the changes in omap2/omapfb/Kconfig instead of omap2/Kconfig. The functional effect remains the same, and the place of implementation is more appropriate. - Provide details of non-vrfb devices in commit description in patch 3/3 - Removed extra paranthesis in cpu checks Senthilvadivu Guruswamy (3): OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3 OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3 arch/arm/plat-omap/include/plat/vrfb.h | 16 ++++++++++++++++ drivers/video/omap2/omapfb/Kconfig | 2 +- drivers/video/omap2/omapfb/omapfb-main.c | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletions(-) ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v6 1/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB 2010-10-08 6:56 [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB Guruswamy Senthilvadivu @ 2010-10-08 6:56 ` Guruswamy Senthilvadivu 2010-10-08 6:56 ` [PATCH v6 2/3] OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3 Guruswamy Senthilvadivu 2010-10-08 9:52 ` [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build Tomi Valkeinen 1 sibling, 1 reply; 6+ messages in thread From: Guruswamy Senthilvadivu @ 2010-10-08 6:56 UTC (permalink / raw) To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy 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 files 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.6.3.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v6 2/3] OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3 2010-10-08 6:56 ` [PATCH v6 1/3] " Guruswamy Senthilvadivu @ 2010-10-08 6:56 ` Guruswamy Senthilvadivu 2010-10-08 6:56 ` [PATCH v6 3/3] OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3 Guruswamy Senthilvadivu 0 siblings, 1 reply; 6+ messages in thread From: Guruswamy Senthilvadivu @ 2010-10-08 6:56 UTC (permalink / raw) To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy From: Senthilvadivu Guruswamy <svadivu@ti.com> config VRFB should depend on ARCH_OMAP2 or ARCH_OMAP3. Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com> --- drivers/video/omap2/omapfb/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig index 43496d6..65149b2 100644 --- a/drivers/video/omap2/omapfb/Kconfig +++ b/drivers/video/omap2/omapfb/Kconfig @@ -3,7 +3,7 @@ menuconfig FB_OMAP2 depends on FB && OMAP2_DSS select OMAP2_VRAM - select OMAP2_VRFB + select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v6 3/3] OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3 2010-10-08 6:56 ` [PATCH v6 2/3] OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3 Guruswamy Senthilvadivu @ 2010-10-08 6:56 ` Guruswamy Senthilvadivu 0 siblings, 0 replies; 6+ messages in thread From: Guruswamy Senthilvadivu @ 2010-10-08 6:56 UTC (permalink / raw) To: tomi.valkeinen, hvaibhav, linux-omap, linux-fbdev; +Cc: Senthilvadivu Guruswamy From: Senthilvadivu Guruswamy <svadivu@ti.com> VRFB is supported only on OMAP2 and OMAP3 platforms. If VRFB rotation is not supported by the hardware and the user requests VRFB rotation, print a warning and ignore the request from the user. 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 bddfca6..fcd9038 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -2198,6 +2198,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 supported in this hardware," + "ignoring the module parameter vrfb=y\n"); + } + + mutex_init(&fbdev->mtx); fbdev->dev = &pdev->dev; -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build 2010-10-08 6:56 [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB Guruswamy Senthilvadivu 2010-10-08 6:56 ` [PATCH v6 1/3] " Guruswamy Senthilvadivu @ 2010-10-08 9:52 ` Tomi Valkeinen 2010-10-08 10:31 ` Guruswamy, Senthilvadivu 1 sibling, 1 reply; 6+ messages in thread From: Tomi Valkeinen @ 2010-10-08 9:52 UTC (permalink / raw) To: ext Guruswamy Senthilvadivu Cc: hvaibhav@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org On Fri, 2010-10-08 at 08:44 +0200, ext Guruswamy Senthilvadivu wrote: > From: Senthilvadivu Guruswamy <svadivu@ti.com> > > The changelog till v6 are: > - Address Multi-omap build issue > - Added a check to warn the wrong usage of vrfb > in non-vrfb omap devices. > - The patch subject is as per the naming conventions > - patch 2/3 now has the changes in omap2/omapfb/Kconfig > instead of omap2/Kconfig. The functional effect remains > the same, and the place of implementation is more appropriate. > - Provide details of non-vrfb devices in commit description in patch 3/3 > - Removed extra paranthesis in cpu checks > Thanks, looks fine to me. Applied to DSS2 tree. Tomi ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build 2010-10-08 9:52 ` [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build Tomi Valkeinen @ 2010-10-08 10:31 ` Guruswamy, Senthilvadivu 0 siblings, 0 replies; 6+ messages in thread From: Guruswamy, Senthilvadivu @ 2010-10-08 10:31 UTC (permalink / raw) To: Tomi Valkeinen Cc: Hiremath, Vaibhav, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org > -----Original Message----- > From: Tomi Valkeinen [mailto:tomi.valkeinen@nokia.com] > Sent: Friday, October 08, 2010 3:22 PM > To: Guruswamy, Senthilvadivu > Cc: Hiremath, Vaibhav; linux-omap@vger.kernel.org; linux- > fbdev@vger.kernel.org > Subject: Re: [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build > without VRFB > > On Fri, 2010-10-08 at 08:44 +0200, ext Guruswamy Senthilvadivu wrote: > > From: Senthilvadivu Guruswamy <svadivu@ti.com> > > > > The changelog till v6 are: > > - Address Multi-omap build issue > > - Added a check to warn the wrong usage of vrfb > > in non-vrfb omap devices. > > - The patch subject is as per the naming conventions > > - patch 2/3 now has the changes in omap2/omapfb/Kconfig > > instead of omap2/Kconfig. The functional effect remains > > the same, and the place of implementation is more appropriate. > > - Provide details of non-vrfb devices in commit description in patch > 3/3 > > - Removed extra paranthesis in cpu checks > > > > Thanks, looks fine to me. Applied to DSS2 tree. > Thanks. > Tomi > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-10-08 10:31 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-10-08 6:56 [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB Guruswamy Senthilvadivu 2010-10-08 6:56 ` [PATCH v6 1/3] " Guruswamy Senthilvadivu 2010-10-08 6:56 ` [PATCH v6 2/3] OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3 Guruswamy Senthilvadivu 2010-10-08 6:56 ` [PATCH v6 3/3] OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3 Guruswamy Senthilvadivu 2010-10-08 9:52 ` [PATCH v6 0/3] OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build Tomi Valkeinen 2010-10-08 10:31 ` 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).