Messages in this thread | | | Date | Fri, 22 May 2015 21:24:13 -0700 | From | Guenter Roeck <> | Subject | Re: [PATCH resend 3/5] xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs() |
| |
On 05/04/2015 03:35 PM, Chris Zankel wrote: > Hi Guenter, > > Sorry for the delay. Will work on it later today or tomorrow. > Hi Chris,
I see this patch in -next, but still not in mainline. Are you planning to send it to Linus anytime soon ?
Thanks, Guenter
> Thanks, > -Chris > > > On Mon, May 4, 2015 at 3:30 PM, Guenter Roeck <linux@roeck-us.net> wrote: >> xtensa:allmodconfig fails to build with the following errors. >> >> drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c: >> In function ‘gk20a_instobj_dtor_dma’: >> drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:154:2: error: >> implicit declaration of function ‘dma_free_attrs’ >> drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c: >> In function ‘gk20a_instobj_ctor_dma’: >> drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:218:2: error: >> implicit declaration of function ‘dma_alloc_attrs’ >> >> Xtensa does not provide those functions at this time. >> Provide dummy implementations to avoid build errors. >> >> Acked-by: Max Filippov <jcmvbkbc@gmail.com> >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >> --- >> Please consider pushing this patch into mainline, or provide feedback >> on how to improve it to be acceptable. >> >> arch/xtensa/include/asm/dma-mapping.h | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> >> diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h >> index 172a02a6ad14..ba78ccf651e7 100644 >> --- a/arch/xtensa/include/asm/dma-mapping.h >> +++ b/arch/xtensa/include/asm/dma-mapping.h >> @@ -185,4 +185,17 @@ static inline int dma_get_sgtable(struct device *dev, struct sg_table *sgt, >> return -EINVAL; >> } >> >> +static inline void *dma_alloc_attrs(struct device *dev, size_t size, >> + dma_addr_t *dma_handle, gfp_t flag, >> + struct dma_attrs *attrs) >> +{ >> + return NULL; >> +} >> + >> +static inline void dma_free_attrs(struct device *dev, size_t size, >> + void *vaddr, dma_addr_t dma_handle, >> + struct dma_attrs *attrs) >> +{ >> +} >> + >> #endif /* _XTENSA_DMA_MAPPING_H */ >> -- >> 2.1.0 >> >
| |