public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [OMAPZOOM][PATCH 2/6] Increase isp workaround buffer size for 8MP sensor.
@ 2009-01-30  0:53 Dominic Curran
  2009-01-30  3:50 ` Hiremath, Vaibhav
  0 siblings, 1 reply; 2+ messages in thread
From: Dominic Curran @ 2009-01-30  0:53 UTC (permalink / raw)
  To: linux-omap, video4linux-list; +Cc: greg.hofer

From: Dominic Curran <dcurran@ti.com>
Subject: [OMAPZOOM][PATCH 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 <dcurran@ti.com>
---
 drivers/media/video/isp/isp.c     |   10 +++++-----
 drivers/media/video/isp/isp.h     |    4 ++--
 drivers/media/video/isp/ispccdc.c |    2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

Index: omapzoom04/drivers/media/video/isp/isp.c
===================================================================
--- omapzoom04.orig/drivers/media/video/isp/isp.c
+++ 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;
Index: omapzoom04/drivers/media/video/isp/isp.h
===================================================================
--- omapzoom04.orig/drivers/media/video/isp/isp.h
+++ omapzoom04/drivers/media/video/isp/isp.h
@@ -69,8 +69,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 / (4 * 1024))
 
 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
===================================================================
--- omapzoom04.orig/drivers/media/video/isp/ispccdc.c
+++ 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 <<

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

^ permalink raw reply	[flat|nested] 2+ messages in thread
* RE: [OMAPZOOM][PATCH 2/6] Increase isp workaround buffer size for 8MP sensor.
  2009-01-30  0:53 [OMAPZOOM][PATCH 2/6] Increase isp workaround buffer size for 8MP sensor Dominic Curran
@ 2009-01-30  3:50 ` Hiremath, Vaibhav
  0 siblings, 0 replies; 2+ messages in thread
From: Hiremath, Vaibhav @ 2009-01-30  3:50 UTC (permalink / raw)
  To: Curran, Dominic, linux-omap, video4linux-list@redhat.com
  Cc: greg.hofer@hp.com



Thanks,
Vaibhav Hiremath

> -----Original Message-----
> From: video4linux-list-bounces@redhat.com [mailto:video4linux-list-
> bounces@redhat.com] On Behalf Of Curran, Dominic
> Sent: Friday, January 30, 2009 6:24 AM
> To: linux-omap; video4linux-list@redhat.com
> Cc: greg.hofer@hp.com
> Subject: [OMAPZOOM][PATCH 2/6] Increase isp workaround buffer size
> for 8MP sensor.
> 
> From: Dominic Curran <dcurran@ti.com>
> Subject: [OMAPZOOM][PATCH 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 <dcurran@ti.com>
> ---
>  drivers/media/video/isp/isp.c     |   10 +++++-----
>  drivers/media/video/isp/isp.h     |    4 ++--
>  drivers/media/video/isp/ispccdc.c |    2 ++
>  3 files changed, 9 insertions(+), 7 deletions(-)
> 
> Index: omapzoom04/drivers/media/video/isp/isp.c
> ===================================================================
> --- omapzoom04.orig/drivers/media/video/isp/isp.c
> +++ 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;
> Index: omapzoom04/drivers/media/video/isp/isp.h
> ===================================================================
> --- omapzoom04.orig/drivers/media/video/isp/isp.h
> +++ omapzoom04/drivers/media/video/isp/isp.h
> @@ -69,8 +69,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 / (4 * 1024))
> 
[Hiremath, Vaibhav] Is here (4 * 1024) indicates ISP-MMUSG page size configuration or normal kernel page size?

If it is kernel page size, then we can use PAGE_SIZE macro instead of hard coding.

>  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
> ===================================================================
> --- omapzoom04.orig/drivers/media/video/isp/ispccdc.c
> +++ 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 <<
> 
> --
> video4linux-list mailing list
> Unsubscribe mailto:video4linux-list-
> request@redhat.com?subject=unsubscribe
> https://www.redhat.com/mailman/listinfo/video4linux-list


--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-30  3:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-30  0:53 [OMAPZOOM][PATCH 2/6] Increase isp workaround buffer size for 8MP sensor Dominic Curran
2009-01-30  3:50 ` Hiremath, Vaibhav

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox