From patchwork Thu Jan 29 16:19:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Towle X-Patchwork-Id: 28099 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrpN-0003Bh-67; Thu, 29 Jan 2015 17:20:21 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1YGrpL-0006pB-0M; Thu, 29 Jan 2015 17:20:21 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755034AbbA2QUN (ORCPT + 1 other); Thu, 29 Jan 2015 11:20:13 -0500 Received: from 82-70-136-246.dsl.in-addr.zen.co.uk ([82.70.136.246]:55511 "EHLO xk120" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752945AbbA2QTw (ORCPT ); Thu, 29 Jan 2015 11:19:52 -0500 Received: from william by xk120 with local (Exim 4.80) (envelope-from ) id 1YGros-0007WX-Vb; Thu, 29 Jan 2015 16:19:51 +0000 From: William Towle To: linux-kernel@lists.codethink.co.uk, linux-media@vger.kernel.org, Guennadi Liakhovetski , Sergei Shtylyov , Hans Verkuil Subject: [PATCH 6/8] WmT: adv7604 driver compatibility Date: Thu, 29 Jan 2015 16:19:46 +0000 Message-Id: <1422548388-28861-7-git-send-email-william.towle@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1422548388-28861-1-git-send-email-william.towle@codethink.co.uk> References: <1422548388-28861-1-git-send-email-william.towle@codethink.co.uk> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.1.29.160618 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_TO_X5 0, __REFERENCES 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Add 'struct media_pad pad' member and suitable glue code, so that soc_camera/rcar_vin can become agnostic to whether an old or new- style driver (wrt pad API use) can sit underneath This version has been reworked to include appropriate constant and datatype names for kernel v3.18 --- drivers/media/platform/soc_camera/soc_camera.c | 148 +++++++++++++++++++- drivers/media/platform/soc_camera/soc_scale_crop.c | 43 +++++- include/media/soc_camera.h | 1 + 3 files changed, 182 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index f4be2a1..efc20bf 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -37,8 +37,11 @@ #include #include #include +#if 0 #include #include +#endif +#include /* Default to VGA resolution */ #define DEFAULT_WIDTH 640 @@ -453,6 +456,98 @@ static int soc_camera_expbuf(struct file *file, void *priv, return vb2_expbuf(&icd->vb2_vidq, p); } +static int soc_camera_init_user_formats_pad(struct soc_camera_device *icd, int src_pad_idx) +{ + struct v4l2_subdev *sd= soc_camera_to_subdev(icd); + struct soc_camera_host *ici = to_soc_camera_host(icd->parent); + struct v4l2_subdev_mbus_code_enum code; + int fmts= 0, raw_fmts, i, ret; + + code.pad= src_pad_idx; + code.index= 0; + + // subdev_has_op -> enum_mbus_code vs enum_mbus_fmt + if (v4l2_subdev_has_op(sd, pad, enum_mbus_code)) { + while (!v4l2_subdev_call(sd, pad, enum_mbus_code, NULL, &code)) + code.index++; + } else { + u32 pixcode; + + while (!v4l2_subdev_call(sd, video, enum_mbus_fmt, code.index, &pixcode)) + { + code.code= pixcode; + code.index++; + } + } + raw_fmts= code.index; + + if (!ici->ops->get_formats) { + /* + * Fallback mode - the host will have to serve all + * sensor-provided formats one-to-one to the user + */ + fmts = raw_fmts; + } + else { + /* + * First pass - only count formats this host-sensor + * configuration can provide + */ + for (i = 0; i < raw_fmts; i++) { + int ret = ici->ops->get_formats(icd, i, NULL); + if (ret < 0) + return ret; + fmts += ret; + } + } + + if (!fmts) + return -ENXIO; + + icd->user_formats = + vmalloc(fmts * sizeof(struct soc_camera_format_xlate)); + if (!icd->user_formats) + return -ENOMEM; + + dev_dbg(icd->pdev, "Found %d supported formats.\n", fmts); + + /* Second pass - actually fill data formats */ + fmts = 0; + for (i = 0; i < raw_fmts; i++) { + if (!ici->ops->get_formats) { + code.index= i; + // subdev_has_op -> enum_mbus_code vs enum_mbus_fmt + if (v4l2_subdev_has_op(sd, pad, enum_mbus_code)) { + v4l2_subdev_call(sd, pad, enum_mbus_code, NULL, &code); + } else { + u32 pixcode; + + v4l2_subdev_call(sd, video, enum_mbus_fmt, code.index, &pixcode); + code.code= pixcode; + } + icd->user_formats[fmts].host_fmt = + soc_mbus_get_fmtdesc(code.code); + if (icd->user_formats[fmts].host_fmt) + icd->user_formats[fmts++].code = code.code; + } else { + ret = ici->ops->get_formats(icd, i, + &icd->user_formats[fmts]); + if (ret < 0) + goto egfmt; + fmts += ret; + } + } + + icd->num_user_formats = fmts; + icd->current_fmt = &icd->user_formats[0]; + + return 0; + +egfmt: + vfree(icd->user_formats); + return ret; +} + /* Always entered with .host_lock held */ static int soc_camera_init_user_formats(struct soc_camera_device *icd) { @@ -1289,6 +1384,7 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) { struct v4l2_subdev *sd = soc_camera_to_subdev(icd); struct v4l2_mbus_framefmt mf; + int src_pad_idx= -1; int ret; sd->grp_id = soc_camera_grp_id(icd); @@ -1307,7 +1403,30 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) } /* At this point client .probe() should have run already */ - ret = soc_camera_init_user_formats(icd); + // subdev_has_op -> enum_mbus_code vs enum_mbus_fmt + if (!v4l2_subdev_has_op(sd, pad, enum_mbus_code)) + ret = soc_camera_init_user_formats(icd); + else { + ret = media_entity_init(&icd->vdev->entity, 1, + &icd->pad, 0); + if (!ret) { + for (src_pad_idx= 0; src_pad_idx < sd->entity.num_pads; src_pad_idx++) + if (sd->entity.pads[src_pad_idx].flags == MEDIA_PAD_FL_SOURCE) + break; + + if (src_pad_idx < sd->entity.num_pads) { + ret = media_entity_create_link( + &icd->vdev->entity, 0, + &sd->entity, src_pad_idx, + MEDIA_LNK_FL_IMMUTABLE | + MEDIA_LNK_FL_ENABLED); + } + } + + if (!ret) + ret = soc_camera_init_user_formats_pad(icd, + src_pad_idx); + } if (ret < 0) goto eusrfmt; @@ -1318,11 +1437,28 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) goto evidstart; /* Try to improve our guess of a reasonable window format */ - if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) { - icd->user_width = mf.width; - icd->user_height = mf.height; - icd->colorspace = mf.colorspace; - icd->field = mf.field; + // subdev_has_op -> get_fmt vs g_mbus_fmt + if (v4l2_subdev_has_op(sd, pad, enum_mbus_code) + && v4l2_subdev_has_op(sd, pad, get_fmt) + && src_pad_idx != -1) { + struct v4l2_subdev_format sd_format; + + sd_format.pad= src_pad_idx; + sd_format.which= V4L2_SUBDEV_FORMAT_ACTIVE; + + if (!v4l2_subdev_call(sd, pad, get_fmt, NULL, &sd_format)) { + icd->user_width = sd_format.format.width; + icd->user_height = sd_format.format.height; + icd->colorspace = sd_format.format.colorspace; + icd->field = sd_format.format.field; + } + } else { + if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) { + icd->user_width = mf.width; + icd->user_height = mf.height; + icd->colorspace = mf.colorspace; + icd->field = mf.field; + } } soc_camera_remove_device(icd); diff --git a/drivers/media/platform/soc_camera/soc_scale_crop.c b/drivers/media/platform/soc_camera/soc_scale_crop.c index 8e74fb7..8a1ca05 100644 --- a/drivers/media/platform/soc_camera/soc_scale_crop.c +++ b/drivers/media/platform/soc_camera/soc_scale_crop.c @@ -224,9 +224,27 @@ static int client_s_fmt(struct soc_camera_device *icd, bool host_1to1; int ret; - ret = v4l2_device_call_until_err(sd->v4l2_dev, - soc_camera_grp_id(icd), video, - s_mbus_fmt, mf); + // subdev_has_op -> set_fmt vs s_mbus_fmt + if (v4l2_subdev_has_op(sd, pad, set_fmt)) { + struct v4l2_subdev_format sd_format; + struct media_pad *remote_pad; + + remote_pad= media_entity_remote_pad( + &icd->vdev->entity.pads[0]); + sd_format.pad = remote_pad->index; + sd_format.which= V4L2_SUBDEV_FORMAT_ACTIVE; + sd_format.format= *mf; + + ret = v4l2_device_call_until_err(sd->v4l2_dev, + soc_camera_grp_id(icd), pad, set_fmt, NULL, + &sd_format); + + mf->width = sd_format.format.width; + mf->height = sd_format.format.height; + } else { + ret = v4l2_device_call_until_err(sd->v4l2_dev, + soc_camera_grp_id(icd), video, s_mbus_fmt, mf); + } if (ret < 0) return ret; @@ -264,9 +282,26 @@ static int client_s_fmt(struct soc_camera_device *icd, tmp_h = min(2 * tmp_h, max_height); mf->width = tmp_w; mf->height = tmp_h; - ret = v4l2_device_call_until_err(sd->v4l2_dev, + // subdev_has_op -> set_fmt vs s_mbus_fmt + if (v4l2_subdev_has_op(sd, pad, set_fmt)) { + struct v4l2_subdev_format sd_format; + struct media_pad *remote_pad; + + remote_pad= media_entity_remote_pad( + &icd->vdev->entity.pads[0]); + sd_format.pad = remote_pad->index; + sd_format.which= V4L2_SUBDEV_FORMAT_ACTIVE; + sd_format.format= *mf; + + ret = v4l2_device_call_until_err(sd->v4l2_dev, + soc_camera_grp_id(icd), + pad, set_fmt, NULL, + &sd_format); + } else { + ret = v4l2_device_call_until_err(sd->v4l2_dev, soc_camera_grp_id(icd), video, s_mbus_fmt, mf); + } dev_geo(dev, "Camera scaled to %ux%u\n", mf->width, mf->height); if (ret < 0) { diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 2f6261f..f0c5238 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -42,6 +42,7 @@ struct soc_camera_device { unsigned char devnum; /* Device number per host */ struct soc_camera_sense *sense; /* See comment in struct definition */ struct video_device *vdev; + struct media_pad pad; struct v4l2_ctrl_handler ctrl_handler; const struct soc_camera_format_xlate *current_fmt; struct soc_camera_format_xlate *user_formats;