From f86fdb9bcb807e7b6bbd1240d5930f72e879e06d Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Tue, 10 Nov 2009 23:28:30 -0300
Subject: [PATCH] --- yaml --- r: 174140 b: refs/heads/master c:
 1047a83844a4d894a068d94aca2d3efe54ac7a9c h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/video/cx18/cx18-queue.c | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f0f7fbb220aa..7a904f527278 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22dce188ef3e1e058ceabe3b3072640d7568f764
+refs/heads/master: 1047a83844a4d894a068d94aca2d3efe54ac7a9c
diff --git a/trunk/drivers/media/video/cx18/cx18-queue.c b/trunk/drivers/media/video/cx18/cx18-queue.c
index 98cbf001f8da..f2d539f6bdf9 100644
--- a/trunk/drivers/media/video/cx18/cx18-queue.c
+++ b/trunk/drivers/media/video/cx18/cx18-queue.c
@@ -280,6 +280,7 @@ void cx18_load_queues(struct cx18_stream *s)
 	struct cx18_buffer *buf;
 	int mdl_id;
 	int i;
+	u32 partial_buf_size;
 
 	/*
 	 * Attach buffers to MDLs, give the MDLs ids, and add MDLs to q_free
@@ -308,10 +309,24 @@ void cx18_load_queues(struct cx18_stream *s)
 				    &cx->scb->cpu_mdl[mdl_id + i].length);
 		}
 
-		if (i == s->bufs_per_mdl)
+		if (i == s->bufs_per_mdl) {
+			/*
+			 * The encoder doesn't honor s->mdl_size.  So in the
+			 * case of a non-integral number of buffers to meet
+			 * mdl_size, we lie about the size of the last buffer
+			 * in the MDL to get the encoder to really only send
+			 * us mdl_size bytes per MDL transfer.
+			 */
+			partial_buf_size = s->mdl_size % s->buf_size;
+			if (partial_buf_size) {
+				cx18_writel(cx, partial_buf_size,
+				      &cx->scb->cpu_mdl[mdl_id + i - 1].length);
+			}
 			cx18_enqueue(s, mdl, &s->q_free);
-		else
-			cx18_push(s, mdl, &s->q_idle); /* not enough buffers */
+		} else {
+			/* Not enough buffers for this MDL; we won't use it */
+			cx18_push(s, mdl, &s->q_idle);
+		}
 		mdl_id += i;
 	}
 }