summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2007-03-14 03:44:57 +0100
committerOliver Endriss <o.endriss@gmx.de>2007-03-14 03:44:57 +0100
commit806e8a78b6b2b8bbab30dafd89ada8402e9564ed (patch)
treee6668f643b4e3b06dacaabdad4516d6d0da63d99
parentba0c6fb06db39c56b08a15def52d2f413101c14b (diff)
downloadmediapointer-dvb-s2-806e8a78b6b2b8bbab30dafd89ada8402e9564ed.tar.gz
mediapointer-dvb-s2-806e8a78b6b2b8bbab30dafd89ada8402e9564ed.tar.bz2
saa7146: Fix allocation of clipping memory
From: Oliver Endriss <o.endriss@gmx.de> Olaf Hering pointed out that SAA7146_CLIPPING_MEM would become very large for PAGE_SIZE > 4K. In fact the number of clipping windows is limited to 16, and calculate_clipping_registers_rect() does not use more than 256 bytes. SAA7146_CLIPPING_MEM adjusted accordingly. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Thanks-to: Olaf Hering <olaf@aepfle.de> Acked-by: Michael Hunold <hunold@linuxtv.org>
-rw-r--r--linux/include/media/saa7146_vv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h
index 83fe2e3d1..50e33b0e9 100644
--- a/linux/include/media/saa7146_vv.h
+++ b/linux/include/media/saa7146_vv.h
@@ -239,7 +239,8 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits);
#define SAA7146_HPS_SYNC_PORT_B 0x01
/* some memory sizes */
-#define SAA7146_CLIPPING_MEM (14*PAGE_SIZE)
+/* max. 16 clipping rectangles */
+#define SAA7146_CLIPPING_MEM (16 * 4 * sizeof(u32))
/* some defines for the various clipping-modes */
#define SAA7146_CLIPPING_RECT 0x4