diff mbox

[v2,3/3] media: soc_camera: rcar_vin: Add NV16 horizontal scaling-up support

Message ID 1413439968-6349-4-git-send-email-ykaneko0929@gmail.com (mailing list archive)
State Superseded
Headers show

Commit Message

Yoshihiro Kaneko Oct. 16, 2014, 6:12 a.m. UTC 
From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>

Up until now scaling has been forbidden for the NV16 capture format.
This patch adds support for horizontal scaling-up for NV16. Vertical
scaling-up for NV16 is forbidden by the H/W specification.

Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---

v2 [Yoshihiro Kaneko]
* Updated change log text from Simon Horman
* Code-style fixes as suggested by Sergei Shtylyov

 drivers/media/platform/soc_camera/rcar_vin.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index ff5f80a..234cf86 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -646,7 +646,7 @@  static int rcar_vin_setup(struct rcar_vin_priv *priv)
 	/* output format */
 	switch (icd->current_fmt->host_fmt->fourcc) {
 	case V4L2_PIX_FMT_NV16:
-		iowrite32(ALIGN(ALIGN(cam->width, 0x20) * cam->height, 0x80),
+		iowrite32(ALIGN((cam->out_width * cam->out_height), 0x80),
 			  priv->base + VNUVAOF_REG);
 		dmr = VNDMR_DTMD_YCSEP;
 		output_is_yuv = true;
@@ -1619,9 +1619,15 @@  static int rcar_vin_set_fmt(struct soc_camera_device *icd,
 	   width of the multiple of 32 for H/W specification. */
 	if (priv->error_flag == false)
 		priv->error_flag = true;
-	else {
-		if ((pixfmt == V4L2_PIX_FMT_NV16) && (pix->width & 0x1F)) {
-			dev_err(icd->parent, "Specified width error in NV16 format.\n");
+	else if (pixfmt == V4L2_PIX_FMT_NV16) {
+		if (pix->width & 0x1F) {
+			dev_err(icd->parent,
+				"Specified width error in NV16 format. Please specify the multiple of 32.\n");
+			return -EINVAL;
+		}
+		if (pix->height != cam->height) {
+			dev_err(icd->parent,
+				"Vertical scaling-up error in NV16 format. Please specify input height size.\n");
 			return -EINVAL;
 		}
 	}
@@ -1668,6 +1674,7 @@  static int rcar_vin_set_fmt(struct soc_camera_device *icd,
 	case V4L2_PIX_FMT_YUYV:
 	case V4L2_PIX_FMT_RGB565:
 	case V4L2_PIX_FMT_RGB555X:
+	case V4L2_PIX_FMT_NV16: /* horizontal scaling-up only is supported */
 		can_scale = true;
 		break;
 	default: