On Wed, Dec 13, 2017 at 01:26:04PM -0800, John Stultz wrote: > In trying to add support for drm_hwcomposer to HiKey, > I've needed to utilize the ION CMA heap, and I've noticed > problems with allocations on newer kernels failing. > > It seems back with 204f672255c2 ("ion: Use CMA APIs directly"), > the ion_cma_heap code was modified to use the CMA API, but > kept the arguments as buffer lengths rather then number of pages. > > This results in errors as we don't have enough pages in CMA to > satisfy the exaggerated requests. > > This patch converts the ion_cma_heap CMA API usage to properly > request pages. > > It also fixes a minor issue in the allocation where in the error > path, the cma_release is called with the buffer->size value which > hasn't yet been set. > > Cc: Laura Abbott <labb...@redhat.com> > Cc: Sumit Semwal <sumit.sem...@linaro.org> > Cc: Benjamin Gaignard <benjamin.gaign...@linaro.org> > Cc: Archit Taneja <arch...@codeaurora.org> > Cc: Greg KH <gre...@linuxfoundation.org> > Cc: Daniel Vetter <dan...@ffwll.ch> > Cc: Dmitry Shmidt <dimitr...@google.com> > Cc: Todd Kjos <tk...@google.com> > Cc: Amit Pundir <amit.pun...@linaro.org> > Fixes: 204f672255c2 ("staging: android: ion: Use CMA APIs directly") > Acked-by: Laura Abbott <labb...@redhat.com> > Signed-off-by: John Stultz <john.stu...@linaro.org> > --- > v2: Fix build errors when CONFIG_CMA_ALIGNMENT isn't defined
As v1 is already in my tree, can you send me the diff so I can just apply that instead of me having to revert the original and then add this one? thanks, greg k-h