> -----Original Message-----
> From: JAIN, AMBER
> Sent: Tuesday, May 31, 2011 7:53 PM
> To: Hiremath, Vaibhav; linux-media@xxxxxxxxxxxxxxx
> Cc: sakari.ailus@xxxxxx
> Subject: RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is
> not configured on OMAP
>
>
>
> > -----Original Message-----
> > From: Hiremath, Vaibhav
> > Sent: Tuesday, May 31, 2011 5:07 PM
> > To: JAIN, AMBER; linux-media@xxxxxxxxxxxxxxx
> > Cc: sakari.ailus@xxxxxx
> > Subject: RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA
> is
> > not configured on OMAP
> >
> >
> > > -----Original Message-----
> > > From: JAIN, AMBER
> > > Sent: Tuesday, May 31, 2011 3:59 PM
> > > To: linux-media@xxxxxxxxxxxxxxx
> > > Cc: Hiremath, Vaibhav; sakari.ailus@xxxxxx
> > > Subject: RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA
> > is
> > > not configured on OMAP
> > >
> > > I have tested it on OMAP4430 blaze and OMAP3430 SDP platforms.
> > >
> > > I do not have the hardware to test omap24xxcam change. Can someone
> > please
> > > help me on this?
> > >
> > [Hiremath, Vaibhav] I would suggest splitting this patch into 2, it
> would
> > be easier to handle.
> >
> > I am validating the patch on OMAP3EVM as well; will update you shortly.
> > Pulling in the latest commits, git-fetch is taking huge time.
>
> Do you mean I should have it as a patch-set, or 2 different patches all
> together.
>
[Hiremath, Vaibhav] 2 different patches.
Thanks,
Vaibhav
> ~Amber
> >
> > Thanks,
> > Vaibhav
> >
> > > Thanks,
> > > Amber
> > >
> > > > -----Original Message-----
> > > > From: JAIN, AMBER
> > > > Sent: Tuesday, May 31, 2011 3:22 PM
> > > > To: linux-media@xxxxxxxxxxxxxxx
> > > > Cc: Hiremath, Vaibhav; sakari.ailus@xxxxxx; JAIN, AMBER
> > > > Subject: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA
> is
> > > not
> > > > configured on OMAP
> > > >
> > > > Remove GFP_DMA from the __get_free_pages() call as ZONE_DMA is not
> > > > configured
> > > > on OMAP. Earlier the page allocator used to return a page from
> > > ZONE_NORMAL
> > > > even when GFP_DMA is passed and CONFIG_ZONE_DMA is disabled.
> > > > As a result of commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac, page
> > > > allocator
> > > > returns null in such a scenario with a warning emitted to kernel
> log.
> > > >
> > > > Signed-off-by: Amber Jain <amber@xxxxxx>
> > > > ---
> > > > drivers/media/video/omap/omap_vout.c | 2 +-
> > > > drivers/media/video/omap24xxcam.c | 4 ++--
> > > > 2 files changed, 3 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/drivers/media/video/omap/omap_vout.c
> > > > b/drivers/media/video/omap/omap_vout.c
> > > > index 4ada9be..8cac624 100644
> > > > --- a/drivers/media/video/omap/omap_vout.c
> > > > +++ b/drivers/media/video/omap/omap_vout.c
> > > > @@ -181,7 +181,7 @@ static unsigned long omap_vout_alloc_buffer(u32
> > > > buf_size, u32 *phys_addr)
> > > >
> > > > size = PAGE_ALIGN(buf_size);
> > > > order = get_order(size);
> > > > - virt_addr = __get_free_pages(GFP_KERNEL | GFP_DMA, order);
> > > > + virt_addr = __get_free_pages(GFP_KERNEL , order);
> > > > addr = virt_addr;
> > > >
> > > > if (virt_addr) {
> > > > diff --git a/drivers/media/video/omap24xxcam.c
> > > > b/drivers/media/video/omap24xxcam.c
> > > > index f6626e8..ade9262 100644
> > > > --- a/drivers/media/video/omap24xxcam.c
> > > > +++ b/drivers/media/video/omap24xxcam.c
> > > > @@ -309,11 +309,11 @@ static int
> > > omap24xxcam_vbq_alloc_mmap_buffer(struct
> > > > videobuf_buffer *vb)
> > > > order--;
> > > >
> > > > /* try to allocate as many contiguous pages as possible
> */
> > > > - page = alloc_pages(GFP_KERNEL | GFP_DMA, order);
> > > > + page = alloc_pages(GFP_KERNEL , order);
> > > > /* if allocation fails, try to allocate smaller amount
> */
> > > > while (page == NULL) {
> > > > order--;
> > > > - page = alloc_pages(GFP_KERNEL | GFP_DMA, order);
> > > > + page = alloc_pages(GFP_KERNEL , order);
> > > > if (page == NULL && !order) {
> > > > err = -ENOMEM;
> > > > goto out;
> > > > --
> > > > 1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
