Increase isp workaround buffer size for 8MP sensor.

PATCH In review Dominic Curran 2 participants 3 messages Jan 30, 2009 – Jan 31, 2009 Media (V4L/DVB)

Share & tools

Dominic Curran

author

2009-01-30 23:46 UTC #0 lore raw

PATCH v2 2/6 Increase isp workaround buffer size for 8MP sensor.

From: Dominic Curran <[email protected]>
Subject: [OMAPZOOM][PATCH v2 2/6] Increase isp workaround buffer size for 8MP sensor.

A temporary buffer is created to hold the image while it is written by Previewer module and then read by Resizer module. This is called LSC Workaround. To take into account the Sony IMX046 8MP sensor that buffer needs to be increased in size.
Changed the #defines to be upper case.
Patch also fixes the initialization of a couple of CCDC values.

Signed-off-by Dominic Curran <[email protected]>

---
 drivers/media/video/isp/isp.c     |   10 +++++-----
 drivers/media/video/isp/isp.h     |    7 +++++--
 drivers/media/video/isp/ispccdc.c |    2 ++
 drivers/media/video/isp/ispmmu.h  |    3 +++
 4 files changed, 15 insertions(+), 7 deletions(-)

drivers/media/video/isp/isp.c +5 -5

Index: omapzoom04/drivers/media/video/isp/isp.c
===================================================================
@@ -1172,20 +1172,20 @@ void omapisp_unset_callback()
  **/
 u32 isp_buf_allocation(void)
 {
-	buff_addr = (void *) vmalloc(buffer_size);
+	buff_addr = (void *) vmalloc(ISP_BUFFER_MAX_SIZE);
 
 	if (!buff_addr) {
 		printk(KERN_ERR "Cannot allocate memory ");
 		return -ENOMEM;
 	}
 
-	sglist_alloc = videobuf_vmalloc_to_sg(buff_addr, no_of_pages);
+	sglist_alloc = videobuf_vmalloc_to_sg(buff_addr, ISP_BUFFER_MAX_PAGES);
 	if (!sglist_alloc) {
 		printk(KERN_ERR "videobuf_vmalloc_to_sg error");
 		return -ENOMEM;
 	}
-	num_sc = dma_map_sg(NULL, sglist_alloc, no_of_pages, 1);
-	buff_addr_mapped = ispmmu_map_sg(sglist_alloc, no_of_pages);
+	num_sc = dma_map_sg(NULL, sglist_alloc, ISP_BUFFER_MAX_PAGES, 1);
+	buff_addr_mapped = ispmmu_map_sg(sglist_alloc, ISP_BUFFER_MAX_PAGES);
 	if (!buff_addr_mapped) {
 		printk(KERN_ERR "ispmmu_map_sg mapping failed ");
 		return -ENOMEM;

@@ -1217,7 +1217,7 @@ void isp_buf_free(void)
 {
 	if (alloc_done == 1) {
 		ispmmu_unmap(buff_addr_mapped);
-		dma_unmap_sg(NULL, sglist_alloc, no_of_pages, 1);
+		dma_unmap_sg(NULL, sglist_alloc, ISP_BUFFER_MAX_PAGES, 1);
 		kfree(sglist_alloc);
 		vfree(buff_addr);
 		alloc_done = 0;

drivers/media/video/isp/isp.h +5 -2

Index: omapzoom04/drivers/media/video/isp/isp.h
===================================================================
@@ -26,6 +26,9 @@
 #define OMAP_ISP_TOP_H
 #include <media/videobuf-dma-sg.h>
 #include <linux/videodev2.h>
+
+#include "ispmmu.h"
+
 #define OMAP_ISP_CCDC		(1 << 0)
 #define OMAP_ISP_PREVIEW	(1 << 1)
 #define OMAP_ISP_RESIZER	(1 << 2)

@@ -69,8 +72,8 @@
 #define NUM_ISP_CAPTURE_FORMATS 	(sizeof(isp_formats) /\
 							sizeof(isp_formats[0]))
 #define ISP_WORKAROUND 1
-#define buffer_size (1024 * 1024 * 10)
-#define no_of_pages (buffer_size / (4 * 1024))
+#define ISP_BUFFER_MAX_SIZE (1024 * 1024 * 16)
+#define ISP_BUFFER_MAX_PAGES (ISP_BUFFER_MAX_SIZE / ISPMMU_PAGE_SIZE)
 
 typedef int (*isp_vbq_callback_ptr) (struct videobuf_buffer *vb);
 typedef void (*isp_callback_t) (unsigned long status,

drivers/media/video/isp/ispccdc.c +2 -0

Index: omapzoom04/drivers/media/video/isp/ispccdc.c
===================================================================
@@ -1265,6 +1265,8 @@ int ispccdc_config_size(u32 input_w, u32
 	}
 
 	if (ispccdc_obj.ccdc_outfmt == CCDC_OTHERS_VP) {
+		ispccdc_obj.ccdcin_woffset = 0;
+		ispccdc_obj.ccdcin_hoffset = 0;
 		omap_writel((ispccdc_obj.ccdcin_woffset <<
 					ISPCCDC_FMT_HORZ_FMTSPH_SHIFT) |
 					(ispccdc_obj.ccdcin_w <<

drivers/media/video/isp/ispmmu.h +3 -0

Index: omapzoom04/drivers/media/video/isp/ispmmu.h
===================================================================
@@ -59,6 +59,9 @@
 /* Number of entries per L2 Page table */
 #define ISPMMU_L2D_ENTRIES_NR		256
 
+/* Size of MMU page in bytes */
+#define ISPMMU_PAGE_SIZE		4096
+
 /*
  * Statically allocate 16KB for L2 page tables. 16KB can be used for
  * up to 16 L2 page tables which cover up to 16MB space. We use an array of 16

Alexey Klimov

2009-01-31 15:07 UTC #1 lore raw

Hello, Dominic
May i ask few questions ?

Well, looks like it's unrelated to your patch. Lines that don't looks okay to me appear in your patch.

Quoted 24 lines · Dominic Curran

From: Dominic Curran <[email protected]>
Subject: [OMAPZOOM][PATCH v2 2/6] Increase isp workaround buffer size for 8MP sensor.
A temporary buffer is created to hold the image while it is written by Previewer module and then read by Resizer module. This is called LSC Workaround. To take into account the Sony IMX046 8MP sensor that buffer needs to be increased in size.
Changed the #defines to be upper case.
Patch also fixes the initialization of a couple of CCDC values.
Signed-off-by Dominic Curran <[email protected]>
---
 drivers/media/video/isp/isp.c     |   10 +++++-----
 drivers/media/video/isp/isp.h     |    7 +++++--
 drivers/media/video/isp/ispccdc.c |    2 ++
 drivers/media/video/isp/ispmmu.h  |    3 +++
 4 files changed, 15 insertions(+), 7 deletions(-)
Index: omapzoom04/drivers/media/video/isp/isp.c
===================================================================

drivers/media/video/isp/isp.c void omapisp_unset_callback() · line 1178

Quoted 8 lines

drivers/media/video/isp/isp.c +1 -1

@@ -1172,20 +1172,20 @@ void omapisp_unset_callback()
  **/
 u32 isp_buf_allocation(void)
 {
-	buff_addr = (void *) vmalloc(buffer_size);
+	buff_addr = (void *) vmalloc(ISP_BUFFER_MAX_SIZE);
 
 	if (!buff_addr) {
 		printk(KERN_ERR "Cannot allocate memory ");

Will user understand what module (or system of kernel) provide this printk message ? Should module name be here ?

drivers/media/video/isp/isp.c void omapisp_unset_callback() · line 1184

Quoted 7 lines

drivers/media/video/isp/isp.c +1 -1

 		return -ENOMEM;
 	}
 
-	sglist_alloc = videobuf_vmalloc_to_sg(buff_addr, no_of_pages);
+	sglist_alloc = videobuf_vmalloc_to_sg(buff_addr, ISP_BUFFER_MAX_PAGES);
 	if (!sglist_alloc) {
 		printk(KERN_ERR "videobuf_vmalloc_to_sg error");

Well, may be here too..
By the way, why there is no "\n" in the end of messages in this function ?

drivers/media/video/isp/isp.c void omapisp_unset_callback() · line 1190

Quoted 8 lines

drivers/media/video/isp/isp.c +2 -2

 		return -ENOMEM;
 	}
-	num_sc = dma_map_sg(NULL, sglist_alloc, no_of_pages, 1);
-	buff_addr_mapped = ispmmu_map_sg(sglist_alloc, no_of_pages);
+	num_sc = dma_map_sg(NULL, sglist_alloc, ISP_BUFFER_MAX_PAGES, 1);
+	buff_addr_mapped = ispmmu_map_sg(sglist_alloc, ISP_BUFFER_MAX_PAGES);
 	if (!buff_addr_mapped) {
 		printk(KERN_ERR "ispmmu_map_sg mapping failed ");

Probably the same thing here.
May be someone can correct sitation if necessary..

Quoted 66 lines

drivers/media/video/isp/isp.c +1 -1

 		return -ENOMEM;

@@ -1217,7 +1217,7 @@ void isp_buf_free(void)
 {
 	if (alloc_done == 1) {
 		ispmmu_unmap(buff_addr_mapped);
-		dma_unmap_sg(NULL, sglist_alloc, no_of_pages, 1);
+		dma_unmap_sg(NULL, sglist_alloc, ISP_BUFFER_MAX_PAGES, 1);
 		kfree(sglist_alloc);
 		vfree(buff_addr);
 		alloc_done = 0;

Index: omapzoom04/drivers/media/video/isp/isp.h
===================================================================

drivers/media/video/isp/isp.h +5 -2

@@ -26,6 +26,9 @@
 #define OMAP_ISP_TOP_H
 #include <media/videobuf-dma-sg.h>
 #include <linux/videodev2.h>
+
+#include "ispmmu.h"
+
 #define OMAP_ISP_CCDC		(1 << 0)
 #define OMAP_ISP_PREVIEW	(1 << 1)
 #define OMAP_ISP_RESIZER	(1 << 2)

@@ -69,8 +72,8 @@
 #define NUM_ISP_CAPTURE_FORMATS 	(sizeof(isp_formats) /\
 							sizeof(isp_formats[0]))
 #define ISP_WORKAROUND 1
-#define buffer_size (1024 * 1024 * 10)
-#define no_of_pages (buffer_size / (4 * 1024))
+#define ISP_BUFFER_MAX_SIZE (1024 * 1024 * 16)
+#define ISP_BUFFER_MAX_PAGES (ISP_BUFFER_MAX_SIZE / ISPMMU_PAGE_SIZE)
 
 typedef int (*isp_vbq_callback_ptr) (struct videobuf_buffer *vb);
 typedef void (*isp_callback_t) (unsigned long status,

Index: omapzoom04/drivers/media/video/isp/ispccdc.c
===================================================================

drivers/media/video/isp/ispccdc.c +2 -0

@@ -1265,6 +1265,8 @@ int ispccdc_config_size(u32 input_w, u32
 	}
 
 	if (ispccdc_obj.ccdc_outfmt == CCDC_OTHERS_VP) {
+		ispccdc_obj.ccdcin_woffset = 0;
+		ispccdc_obj.ccdcin_hoffset = 0;
 		omap_writel((ispccdc_obj.ccdcin_woffset <<
 					ISPCCDC_FMT_HORZ_FMTSPH_SHIFT) |
 					(ispccdc_obj.ccdcin_w <<

Index: omapzoom04/drivers/media/video/isp/ispmmu.h
===================================================================

drivers/media/video/isp/ispmmu.h +3 -1

@@ -59,6 +59,9 @@
 /* Number of entries per L2 Page table */
 #define ISPMMU_L2D_ENTRIES_NR		256
 
+/* Size of MMU page in bytes */
+#define ISPMMU_PAGE_SIZE		4096
+
 /*
  * Statically allocate 16KB for L2 page tables. 16KB can be used for
  * up to 16 L2 page tables which cover up to 16MB space. We use an array of 16
--

To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line

Best regards, Klimov Alexey

Curran, Dominic

author

2009-01-31 17:47 UTC #2 lore raw

________________________________________
From: Alexey Klimov [[email protected]]
Sent: Saturday, January 31, 2009 9:08 AM
To: Curran, Dominic
Cc: [email protected]; linux-omap; [email protected]
Subject: Re: [OMAPZOOM][PATCH v2 2/6] Increase isp workaround buffer size for 8MP sensor.

Hello, Dominic
May i ask few questions ?

Well, looks like it's unrelated to your patch. Lines that don't looks okay to me appear in your patch.

Quoted 24 lines · Dominic Curran

From: Dominic Curran <[email protected]>
Subject: [OMAPZOOM][PATCH v2 2/6] Increase isp workaround buffer size for 8MP sensor.
A temporary buffer is created to hold the image while it is written by Previewer module and then read by Resizer module. This is called LSC Workaround. To take into account the Sony IMX046 8MP sensor that buffer needs to be increased in size.
Changed the #defines to be upper case.
Patch also fixes the initialization of a couple of CCDC values.
Signed-off-by Dominic Curran <[email protected]>
---
 drivers/media/video/isp/isp.c     |   10 +++++-----
 drivers/media/video/isp/isp.h     |    7 +++++--
 drivers/media/video/isp/ispccdc.c |    2 ++
 drivers/media/video/isp/ispmmu.h  |    3 +++
 4 files changed, 15 insertions(+), 7 deletions(-)
Index: omapzoom04/drivers/media/video/isp/isp.c
===================================================================

drivers/media/video/isp/isp.c void omapisp_unset_callback() · line 1178

Quoted 8 lines

drivers/media/video/isp/isp.c +1 -1

@@ -1172,20 +1172,20 @@ void omapisp_unset_callback()
  **/
 u32 isp_buf_allocation(void)
 {
-     buff_addr = (void *) vmalloc(buffer_size);
+     buff_addr = (void *) vmalloc(ISP_BUFFER_MAX_SIZE);
 
      if (!buff_addr) {
              printk(KERN_ERR "Cannot allocate memory ");

Will user understand what module (or system of kernel) provide this printk message ? Should module name be here ?

[DC] Agree.

drivers/media/video/isp/isp.c void omapisp_unset_callback() · line 1184

Quoted 7 lines

drivers/media/video/isp/isp.c +1 -1

              return -ENOMEM;
      }
 
-     sglist_alloc = videobuf_vmalloc_to_sg(buff_addr, no_of_pages);
+     sglist_alloc = videobuf_vmalloc_to_sg(buff_addr, ISP_BUFFER_MAX_PAGES);
      if (!sglist_alloc) {
              printk(KERN_ERR "videobuf_vmalloc_to_sg error");

Well, may be here too..
By the way, why there is no "\n" in the end of messages in this function ?

[DC] Agree.

drivers/media/video/isp/isp.c void omapisp_unset_callback() · line 1190

Quoted 8 lines

drivers/media/video/isp/isp.c +2 -2

              return -ENOMEM;
      }
-     num_sc = dma_map_sg(NULL, sglist_alloc, no_of_pages, 1);
-     buff_addr_mapped = ispmmu_map_sg(sglist_alloc, no_of_pages);
+     num_sc = dma_map_sg(NULL, sglist_alloc, ISP_BUFFER_MAX_PAGES, 1);
+     buff_addr_mapped = ispmmu_map_sg(sglist_alloc, ISP_BUFFER_MAX_PAGES);
      if (!buff_addr_mapped) {
              printk(KERN_ERR "ispmmu_map_sg mapping failed ");

Probably the same thing here.
May be someone can correct sitation if necessary..

[DC] Agree.
Thanks Alexey. I will create an extra patch to cleanup those printk's.

Quoted 63 lines

drivers/media/video/isp/isp.c +1 -1

              return -ENOMEM;

@@ -1217,7 +1217,7 @@ void isp_buf_free(void)
 {
      if (alloc_done == 1) {
              ispmmu_unmap(buff_addr_mapped);
-             dma_unmap_sg(NULL, sglist_alloc, no_of_pages, 1);
+             dma_unmap_sg(NULL, sglist_alloc, ISP_BUFFER_MAX_PAGES, 1);
              kfree(sglist_alloc);
              vfree(buff_addr);
              alloc_done = 0;

Index: omapzoom04/drivers/media/video/isp/isp.h
===================================================================

drivers/media/video/isp/isp.h +5 -2

@@ -26,6 +26,9 @@
 #define OMAP_ISP_TOP_H
 #include <media/videobuf-dma-sg.h>
 #include <linux/videodev2.h>
+
+#include "ispmmu.h"
+
 #define OMAP_ISP_CCDC                (1 << 0)
 #define OMAP_ISP_PREVIEW     (1 << 1)
 #define OMAP_ISP_RESIZER     (1 << 2)

@@ -69,8 +72,8 @@
 #define NUM_ISP_CAPTURE_FORMATS      (sizeof(isp_formats) /\
                                                      sizeof(isp_formats[0]))
 #define ISP_WORKAROUND 1
-#define buffer_size (1024 * 1024 * 10)
-#define no_of_pages (buffer_size / (4 * 1024))
+#define ISP_BUFFER_MAX_SIZE (1024 * 1024 * 16)
+#define ISP_BUFFER_MAX_PAGES (ISP_BUFFER_MAX_SIZE / ISPMMU_PAGE_SIZE)
 
 typedef int (*isp_vbq_callback_ptr) (struct videobuf_buffer *vb);
 typedef void (*isp_callback_t) (unsigned long status,

Index: omapzoom04/drivers/media/video/isp/ispccdc.c
===================================================================

drivers/media/video/isp/ispccdc.c +2 -0

@@ -1265,6 +1265,8 @@ int ispccdc_config_size(u32 input_w, u32
      }
 
      if (ispccdc_obj.ccdc_outfmt == CCDC_OTHERS_VP) {
+             ispccdc_obj.ccdcin_woffset = 0;
+             ispccdc_obj.ccdcin_hoffset = 0;
              omap_writel((ispccdc_obj.ccdcin_woffset <<
                                      ISPCCDC_FMT_HORZ_FMTSPH_SHIFT) |
                                      (ispccdc_obj.ccdcin_w <<

Index: omapzoom04/drivers/media/video/isp/ispmmu.h
===================================================================

drivers/media/video/isp/ispmmu.h +3 -1

@@ -59,6 +59,9 @@
 /* Number of entries per L2 Page table */
 #define ISPMMU_L2D_ENTRIES_NR                256
 
+/* Size of MMU page in bytes */
+#define ISPMMU_PAGE_SIZE             4096
+
 /*
  * Statically allocate 16KB for L2 page tables. 16KB can be used for
  * up to 16 L2 page tables which cover up to 16MB space. We use an array of 16
--

Quoted 3 lines

To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Best regards, Klimov Alexey