2012/2/13 Michal Nazarewicz <mina86@xxxxxxxxxx>: >> On Fri, Feb 10, 2012 at 11:32 AM, Marek Szyprowski >> <m.szyprowski@xxxxxxxxxxx> wrote: >>> >>> @@ -5637,6 +5642,56 @@ static int __alloc_contig_migrate_range(unsigned >>> long start, unsigned long end) >>> return ret > 0 ? 0 : ret; >>> } >>> >>> +/* >>> + * Update zone's cma pages counter used for watermark level calculation. >>> + */ >>> +static inline void __update_cma_wmark_pages(struct zone *zone, int >>> count) >>> +{ >>> + unsigned long flags; >>> + spin_lock_irqsave(&zone->lock, flags); >>> + zone->min_cma_pages += count; >>> + spin_unlock_irqrestore(&zone->lock, flags); >>> + setup_per_zone_wmarks(); >>> +} >>> + >>> +/* >>> + * Trigger memory pressure bump to reclaim some pages in order to be >>> able to >>> + * allocate 'count' pages in single page units. Does similar work as >>> + *__alloc_pages_slowpath() function. >>> + */ >>> +static int __reclaim_pages(struct zone *zone, gfp_t gfp_mask, int count) >>> +{ >>> + enum zone_type high_zoneidx = gfp_zone(gfp_mask); >>> + struct zonelist *zonelist = node_zonelist(0, gfp_mask); >>> + int did_some_progress = 0; >>> + int order = 1; >>> + unsigned long watermark; >>> + >>> + /* >>> + * Increase level of watermarks to force kswapd do his job >>> + * to stabilise at new watermark level. >>> + */ >>> + __modify_min_cma_pages(zone, count); > > > On Mon, 13 Feb 2012 10:57:58 -0800, Robert Nelson <robertcnelson@xxxxxxxxx> > wrote: >> >> Hi Marek, This ^^^ function doesn't seem to exist in this patchset, >> is it in another set posted to lkml? > > > This should read __update_cma_wmark_pages(). Sorry for the incorrect patch. Thanks Michal, that fixed it.. cma-v21 with Rob Clark's omapdrm works great on the Beagle xM.. Regards -- Robert Nelson http://www.rcn-ee.com/ -- 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