summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx23885/cx23885.h
diff options
context:
space:
mode:
authorHans Verkuil2014-11-18 13:51:01 +0100
committerMauro Carvalho Chehab2014-11-25 11:55:32 +0100
commit0c3a14c177aa85afb991e7c2be3921aa9a52a893 (patch)
treede833b66ee640393292bc404e16c8f43a49ae89c /drivers/media/pci/cx23885/cx23885.h
parent[media] vb2: don't free alloc context if it is ERR_PTR (diff)
downloadkernel-qcow2-linux-0c3a14c177aa85afb991e7c2be3921aa9a52a893.tar.gz
kernel-qcow2-linux-0c3a14c177aa85afb991e7c2be3921aa9a52a893.tar.xz
kernel-qcow2-linux-0c3a14c177aa85afb991e7c2be3921aa9a52a893.zip
[media] vb2-dma-sg: add allocation context to dma-sg
Require that dma-sg also uses an allocation context. This is in preparation for adding prepare/finish memops to sync the memory between DMA and CPU. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Pawel Osciak <pawel@osciak.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885.h')
-rw-r--r--drivers/media/pci/cx23885/cx23885.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index cf4efa461ce2..f55cd12da0fd 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -425,6 +425,7 @@ struct cx23885_dev {
struct vb2_queue vb2_vidq;
struct cx23885_dmaqueue vbiq;
struct vb2_queue vb2_vbiq;
+ void *alloc_ctx;
spinlock_t slock;