Regression in Linux next with dma cma changes

Hi,

Looks like commit d222e42e8816 ("dma-contiguous: do not allocate a single page from CMA area") caused a regression at least for omap dss where we now get the following error on init:

omapdss_dispc 58001000.dispc:
dispc_errata_i734_wa_init: dma_alloc_writecombine failed

Any ideas what might be going wrong?

Regards,

Tony

It's probably because the dma_alloc_from_contiguous() call in this path doesn't rebound to allocate a normal single page.

And I guess we should have left the change within dma-direct.

Christoph, do you agree?

I am submitting a revert first.