Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t

dma_addr_t may not fit into void* on some architectures. To be safe, make
vb2_dma_contig_cookie() return a pointer to dma_addr_t and dereference it
in vb2_dma_contig_plane_paddr() back to dma_addr_t.

Signed-off-by: Pawel Osciak <pawel@osciak.com>
Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Pawel Osciak and committed by
Mauro Carvalho Chehab
472af2b0 d6db5bfe

+7 -4
+1 -1
drivers/media/video/videobuf2-dma-contig.c
··· 78 78 { 79 79 struct vb2_dc_buf *buf = buf_priv; 80 80 81 - return (void *)buf->paddr; 81 + return &buf->paddr; 82 82 } 83 83 84 84 static void *vb2_dma_contig_vaddr(void *buf_priv)
+6 -3
include/media/videobuf2-dma-contig.h
··· 14 14 #define _MEDIA_VIDEOBUF2_DMA_COHERENT_H 15 15 16 16 #include <media/videobuf2-core.h> 17 + #include <linux/dma-mapping.h> 17 18 18 - static inline unsigned long vb2_dma_contig_plane_paddr( 19 - struct vb2_buffer *vb, unsigned int plane_no) 19 + static inline dma_addr_t 20 + vb2_dma_contig_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no) 20 21 { 21 - return (unsigned long)vb2_plane_cookie(vb, plane_no); 22 + dma_addr_t *paddr = vb2_plane_cookie(vb, plane_no); 23 + 24 + return *paddr; 22 25 } 23 26 24 27 void *vb2_dma_contig_init_ctx(struct device *dev);