aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-queue.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx18/cx18-queue.c')
-rw-r--r--drivers/media/video/cx18/cx18-queue.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index f2d539f6bdf..63304823cef 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -100,8 +100,8 @@ struct cx18_mdl *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)
100 return mdl; 100 return mdl;
101} 101}
102 102
103static void _cx18_mdl_set_buf_bytesused(struct cx18_stream *s, 103static void _cx18_mdl_update_bufs_for_cpu(struct cx18_stream *s,
104 struct cx18_mdl *mdl) 104 struct cx18_mdl *mdl)
105{ 105{
106 struct cx18_buffer *buf; 106 struct cx18_buffer *buf;
107 u32 buf_size = s->buf_size; 107 u32 buf_size = s->buf_size;
@@ -116,11 +116,12 @@ static void _cx18_mdl_set_buf_bytesused(struct cx18_stream *s,
116 buf->bytesused = bytesused; 116 buf->bytesused = bytesused;
117 bytesused = 0; 117 bytesused = 0;
118 } 118 }
119 cx18_buf_sync_for_cpu(s, buf);
119 } 120 }
120} 121}
121 122
122static inline void cx18_mdl_set_buf_bytesused(struct cx18_stream *s, 123static inline void cx18_mdl_update_bufs_for_cpu(struct cx18_stream *s,
123 struct cx18_mdl *mdl) 124 struct cx18_mdl *mdl)
124{ 125{
125 struct cx18_buffer *buf; 126 struct cx18_buffer *buf;
126 127
@@ -129,8 +130,9 @@ static inline void cx18_mdl_set_buf_bytesused(struct cx18_stream *s,
129 list); 130 list);
130 buf->bytesused = mdl->bytesused; 131 buf->bytesused = mdl->bytesused;
131 buf->readpos = 0; 132 buf->readpos = 0;
133 cx18_buf_sync_for_cpu(s, buf);
132 } else { 134 } else {
133 _cx18_mdl_set_buf_bytesused(s, mdl); 135 _cx18_mdl_update_bufs_for_cpu(s, mdl);
134 } 136 }
135} 137}
136 138
@@ -191,8 +193,7 @@ struct cx18_mdl *cx18_queue_get_mdl(struct cx18_stream *s, u32 id,
191 ret->bytesused = bytesused; 193 ret->bytesused = bytesused;
192 ret->skipped = 0; 194 ret->skipped = 0;
193 /* 0'ed readpos, m_flags & curr_buf when mdl went on q_busy */ 195 /* 0'ed readpos, m_flags & curr_buf when mdl went on q_busy */
194 cx18_mdl_set_buf_bytesused(s, ret); 196 cx18_mdl_update_bufs_for_cpu(s, ret);
195 cx18_mdl_sync_for_cpu(s, ret);
196 if (s->type != CX18_ENC_STREAM_TYPE_TS) 197 if (s->type != CX18_ENC_STREAM_TYPE_TS)
197 set_bit(CX18_F_M_NEED_SWAP, &ret->m_flags); 198 set_bit(CX18_F_M_NEED_SWAP, &ret->m_flags);
198 } 199 }
@@ -331,18 +332,6 @@ void cx18_load_queues(struct cx18_stream *s)
331 } 332 }
332} 333}
333 334
334void _cx18_mdl_sync_for_cpu(struct cx18_stream *s, struct cx18_mdl *mdl)
335{
336 int dma = s->dma;
337 u32 buf_size = s->buf_size;
338 struct pci_dev *pci_dev = s->cx->pci_dev;
339 struct cx18_buffer *buf;
340
341 list_for_each_entry(buf, &mdl->buf_list, list)
342 pci_dma_sync_single_for_cpu(pci_dev, buf->dma_handle,
343 buf_size, dma);
344}
345
346void _cx18_mdl_sync_for_device(struct cx18_stream *s, struct cx18_mdl *mdl) 335void _cx18_mdl_sync_for_device(struct cx18_stream *s, struct cx18_mdl *mdl)
347{ 336{
348 int dma = s->dma; 337 int dma = s->dma;