From patchwork Thu Aug 6 20:26:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 6962141 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B9E379F38B for ; Thu, 6 Aug 2015 20:26:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B08A620690 for ; Thu, 6 Aug 2015 20:26:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D8FF20688 for ; Thu, 6 Aug 2015 20:26:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754917AbbHFU0b (ORCPT ); Thu, 6 Aug 2015 16:26:31 -0400 Received: from mail-yk0-f172.google.com ([209.85.160.172]:36861 "EHLO mail-yk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755037AbbHFU0a (ORCPT ); Thu, 6 Aug 2015 16:26:30 -0400 Received: by ykeo23 with SMTP id o23so72326081yke.3 for ; Thu, 06 Aug 2015 13:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=/k352rCfIV1nUUH14WuiqPYJqPA/5ttvtUxRMupiA8s=; b=FnGydwIv4pexCVDnvp7pmShs6xHsfnVHyKb6h9f9AmSb7kbluglSAcE5Xgu0e4uxJz dzRf/M68H0MGV1s5gTzy7r9r68cWS0Cni2UFWfwxozu8D46l6JLwyVh3SMcmAKDpKEd6 7WZOVmwXaLaT5Hb9F7/cGowYM36Q/kH9fhOOBcQc/7XQzCJOiQsA8qk+zik6TBj9OyqB EKIkaW3JWku8pacYSbea7D5nzCsLQmlWsGV93ij9RiSx56aCgp+vx2KJ7v0s1U3pwa9r 6zAkuG8B2jkG+yA99Mkv4tEU2ghxFHu1xhmAQ2ZNy0EIPoYKthqta1EWUJlgNUV1SOUf S3gw== X-Received: by 10.13.232.67 with SMTP id r64mr4052676ywe.30.1438892789608; Thu, 06 Aug 2015 13:26:29 -0700 (PDT) Received: from Cracker.wifi.univ-paris5.fr ([177.194.72.216]) by smtp.gmail.com with ESMTPSA id b9sm2613919ywa.38.2015.08.06.13.26.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Aug 2015 13:26:28 -0700 (PDT) From: Helen Fornazier To: linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl Cc: Helen Fornazier Subject: [PATCH 2/7] [media] vimc: sen: Integrate the tpg on the sensor Date: Thu, 6 Aug 2015 17:26:09 -0300 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Initialize the test pattern generator on the sensor Generate a colored bar image instead of a grey one Signed-off-by: Helen Fornazier --- drivers/media/platform/vimc/Kconfig | 1 + drivers/media/platform/vimc/vimc-sensor.c | 44 +++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/vimc/Kconfig b/drivers/media/platform/vimc/Kconfig index 81279f4..7cf7e84 100644 --- a/drivers/media/platform/vimc/Kconfig +++ b/drivers/media/platform/vimc/Kconfig @@ -1,6 +1,7 @@ config VIDEO_VIMC tristate "Virtual Media Controller Driver (VIMC)" select VIDEO_V4L2_SUBDEV_API + select VIDEO_TPG default n ---help--- Skeleton driver for Virtual Media Controller diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c index d613792..a2879ad 100644 --- a/drivers/media/platform/vimc/vimc-sensor.c +++ b/drivers/media/platform/vimc/vimc-sensor.c @@ -16,15 +16,19 @@ */ #include +#include #include #include #include #include "vimc-sensor.h" +#define VIMC_SEN_FRAME_MAX_WIDTH 4096 + struct vimc_sen_device { struct vimc_ent_device ved; struct v4l2_subdev sd; + struct tpg_data tpg; struct v4l2_device *v4l2_dev; struct device *dev; struct task_struct *kthread_sen; @@ -87,6 +91,29 @@ static int vimc_sen_get_fmt(struct v4l2_subdev *sd, return 0; } +static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen) +{ + const struct vimc_pix_map *vpix; + + vpix = vimc_pix_map_by_code(vsen->mbus_format.code); + /* This should never be NULL, as we won't allow any format other then + * the ones in the vimc_pix_map_list table */ + BUG_ON(!vpix); + + tpg_s_bytesperline(&vsen->tpg, 0, + vsen->mbus_format.width * vpix->bpp); + tpg_s_buf_height(&vsen->tpg, vsen->mbus_format.height); + tpg_s_fourcc(&vsen->tpg, vpix->pixelformat); + /* TODO: check why the tpg_s_field need this third argument if + * it is already receiving the field */ + tpg_s_field(&vsen->tpg, vsen->mbus_format.field, + vsen->mbus_format.field == V4L2_FIELD_ALTERNATE); + tpg_s_colorspace(&vsen->tpg, vsen->mbus_format.colorspace); + tpg_s_ycbcr_enc(&vsen->tpg, vsen->mbus_format.ycbcr_enc); + tpg_s_quantization(&vsen->tpg, vsen->mbus_format.quantization); + tpg_s_xfer_func(&vsen->tpg, vsen->mbus_format.xfer_func); +} + static const struct v4l2_subdev_pad_ops vimc_sen_pad_ops = { .enum_mbus_code = vimc_sen_enum_mbus_code, .enum_frame_size = vimc_sen_enum_frame_size, @@ -112,7 +139,7 @@ static int vimc_thread_sen(void *data) if (kthread_should_stop()) break; - memset(vsen->frame, 100, vsen->frame_size); + tpg_fill_plane_buffer(&vsen->tpg, V4L2_STD_PAL, 0, vsen->frame); /* Send the frame to all source pads */ for (i = 0; i < vsen->sd.entity.num_pads; i++) @@ -192,6 +219,7 @@ static void vimc_sen_destroy(struct vimc_ent_device *ved) struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device, ved); + tpg_free(&vsen->tpg); media_entity_cleanup(ved->ent); v4l2_device_unregister_subdev(&vsen->sd); kfree(vsen); @@ -242,6 +270,16 @@ struct vimc_ent_device *vimc_sen_create(struct v4l2_device *v4l2_dev, vsen->mbus_format.quantization = V4L2_QUANTIZATION_FULL_RANGE; vsen->mbus_format.xfer_func = V4L2_XFER_FUNC_SRGB; + /* Initialize the test pattern generator */ + tpg_init(&vsen->tpg, vsen->mbus_format.width, + vsen->mbus_format.height); + ret = tpg_alloc(&vsen->tpg, VIMC_SEN_FRAME_MAX_WIDTH); + if (ret) + goto err_clean_m_ent; + + /* Configure the tpg */ + vimc_sen_tpg_s_format(vsen); + /* Fill the vimc_ent_device struct */ vsen->ved.destroy = vimc_sen_destroy; vsen->ved.ent = &vsen->sd.entity; @@ -261,11 +299,13 @@ struct vimc_ent_device *vimc_sen_create(struct v4l2_device *v4l2_dev, if (ret) { dev_err(vsen->dev, "subdev register failed (err=%d)\n", ret); - goto err_clean_m_ent; + goto err_free_tpg; } return &vsen->ved; +err_free_tpg: + tpg_free(&vsen->tpg); err_clean_m_ent: media_entity_cleanup(&vsen->sd.entity); err_clean_pads: