Skip to content

Commit

Permalink
[media] media: mx2_camera: Add image size HW limits
Browse files Browse the repository at this point in the history
The CSI on i.MX27 has some constraints regarding image width.
This patch makes sure those requirements are met in try_fmt().

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
[g.liakhovetski@gmx.de: make constraint i.MX27-specific]
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Javier Martin authored and Mauro Carvalho Chehab committed Dec 20, 2012
1 parent b618b69 commit 6ec5575
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/media/platform/soc_camera/mx2_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -1394,8 +1394,6 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,
return -EINVAL;
}

/* FIXME: implement MX27 limits */

/* limit to MX25 hardware capabilities */
if (cpu_is_mx25()) {
if (xlate->host_fmt->bits_per_sample <= 8)
Expand Down Expand Up @@ -1427,6 +1425,12 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,
pix->sizeimage = soc_mbus_image_size(xlate->host_fmt,
pix->bytesperline, pix->height);
}
} else {
/*
* Width must be a multiple of 8 as requested by the CSI.
* (Table 39-2 in the i.MX27 Reference Manual).
*/
pix->width &= ~0x7;
}

/* limit to sensor capabilities */
Expand Down

0 comments on commit 6ec5575

Please sign in to comment.