Skip to contentSkip to conversation

sh_mobile_ceu_camera: Remove frame size page alignment

PATCH In review Magnus Damm 2 participants 3 messages Dec 9, 2009 – Dec 11, 2009 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh_mobile_ceu_camera: Remove frame size page alignment

From: Magnus Damm <[email protected]>

This patch updates the SuperH Mobile CEU driver to not page align the frame size. Useful in the case of USERPTR with non-page aligned frame sizes and offsets.

---

 drivers/media/video/sh_mobile_ceu_camera.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/video/sh_mobile_ceu_camera.c +2 -3
@@ -199,14 +199,13 @@ static int sh_mobile_ceu_videobuf_setup(
 	struct sh_mobile_ceu_dev *pcdev = ici->priv;
 	int bytes_per_pixel = (icd->current_fmt->depth + 7) >> 3;
 
-	*size = PAGE_ALIGN(icd->user_width * icd->user_height *
-			   bytes_per_pixel);
+	*size = icd->user_width * icd->user_height * bytes_per_pixel;
 
 	if (0 == *count)
 		*count = 2;
 
 	if (pcdev->video_limit) {
-		while (*size * *count > pcdev->video_limit)
+		while (PAGE_ALIGN(*size) * *count > pcdev->video_limit)
 			(*count)--;
 	}
 
#1 lore raw
Quoted 20 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This patch updates the SuperH Mobile CEU driver to not page align the frame size. Useful in the case of USERPTR with non-page aligned frame sizes and offsets.

---

 drivers/media/video/sh_mobile_ceu_camera.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/video/sh_mobile_ceu_camera.c +0 -2
@@ -199,14 +199,13 @@ static int sh_mobile_ceu_videobuf_setup(
 	struct sh_mobile_ceu_dev *pcdev = ici->priv;
 	int bytes_per_pixel = (icd->current_fmt->depth + 7) >> 3;
 
-	*size = PAGE_ALIGN(icd->user_width * icd->user_height *
-			   bytes_per_pixel);

drivers/media/video/sh_mobile_ceu_camera.c static int sh_mobile_ceu_videobuf_setup( · line 210

Quoted 10 lines
drivers/media/video/sh_mobile_ceu_camera.c +2 -1
+	*size = icd->user_width * icd->user_height * bytes_per_pixel;
 
 	if (0 == *count)
 		*count = 2;
 
 	if (pcdev->video_limit) {
-		while (*size * *count > pcdev->video_limit)
+		while (PAGE_ALIGN(*size) * *count > pcdev->video_limit)
 			(*count)--;
 	}

Please, correct me if I'm wrong. Currently most (all?) sh platforms, using this driver, and wishing to use V4L2_MEMORY_MMAP, reserve contiguous memory in their platform code. In this case pcdev->video_limit is set to the size of that area. videobuf-dma-contig.c::__videobuf_mmap_mapper() will anyway allocate page-aligned buffers for V4L2_MEMORY_MMAP, so, even for the case of a platform, not reserving RAM at boot-time, it should work. Similarly it should work for the V4L2_MEMORY_USERPTR case. So, looks ok to me, queued, thanks.

Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

#2 lore raw
Quoted 10 lines · Guennadi Liakhovetski
Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This patch updates the SuperH Mobile CEU driver to not page align the frame size. Useful in the case of USERPTR with non-page aligned frame sizes and offsets.

Quoted 8 lines

Please, correct me if I'm wrong. Currently most (all?) sh platforms, using this driver, and wishing to use V4L2_MEMORY_MMAP, reserve contiguous memory in their platform code. In this case pcdev->video_limit is set to the size of that area. videobuf-dma-contig.c::__videobuf_mmap_mapper() will anyway allocate page-aligned buffers for V4L2_MEMORY_MMAP, so, even for the case of a platform, not reserving RAM at boot-time, it should work. Similarly it should work for the V4L2_MEMORY_USERPTR case. So, looks ok to me, queued, thanks.

Correct. On SuperH Mobile the amount of reserved physically contiguous memory for the CEU can be overridden on the kernel command line, and in the case of systems only using USERPTR it is wise to set it to the reserved memory to zero since the memory will be unused anyway when the V4L2 buffers come from elsewhere.

If there is no physically contiguous memory reserved for the CEU and V4L2 MMAP is used then there is a risk of physically contiguous memory allocation failure due to memory fragmentation. Nothing out of the ordinary, to play it safe just reserve physically contiguous memory during boot up time and be done with it.

/ magnus