From patchwork Fri Oct 31 09:08:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 5203381 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 373D49F318 for ; Fri, 31 Oct 2014 09:08:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F4442015D for ; Fri, 31 Oct 2014 09:08:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4067120154 for ; Fri, 31 Oct 2014 09:08:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756834AbaJaJIZ (ORCPT ); Fri, 31 Oct 2014 05:08:25 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:36068 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756286AbaJaJIY (ORCPT ); Fri, 31 Oct 2014 05:08:24 -0400 Received: by mail-pa0-f53.google.com with SMTP id kx10so7236229pab.26 for ; Fri, 31 Oct 2014 02:08:24 -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; bh=JRlEB4mPG1RTe0t/QWcTiFFiydS8H/UaLaxg/bE2IYw=; b=ETSMkg+DDTAre3atYHZTTzruRSvmfuDWDGSFmxcnRafIXEpz7412uNcCwNLZzX4hEV oTMZUhddl0LenxKZWP0aFEouJzc+jEWbd77wKZKQZutYKZYnn3TyHX7vQHGhP2JdiOlk KXMKzXNJkoqI1CvUTuFwBUFkupLQNgtS7K2CcVhdDpiyggTCgsKL1k3UxMRP12PO+6G5 5po665C423uHejCueWmYm6iHcusjUPGY+Nxi4NVU9L/Nslx8UU8d5Gl2spOaLx87CcgS WdbB6s88T6Gz7Fo3Yuvd+eSrn+ZdBV6mFsjCwC1UeR5tM4nw5iXFU+qbjBcygOZeBo24 BpEA== X-Received: by 10.68.236.168 with SMTP id uv8mr23144582pbc.5.1414746504200; Fri, 31 Oct 2014 02:08:24 -0700 (PDT) Received: from localhost.localdomain (p5095-ipngn6701marunouchi.tokyo.ocn.ne.jp. [153.174.4.95]) by mx.google.com with ESMTPSA id a10sm2858182pdp.0.2014.10.31.02.08.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Oct 2014 02:08:23 -0700 (PDT) From: Yoshihiro Kaneko To: linux-media@vger.kernel.org Cc: Guennadi Liakhovetski , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org Subject: [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support Date: Fri, 31 Oct 2014 18:08:10 +0900 Message-Id: <1414746490-23077-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 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 From: Koji Matsuoka Signed-off-by: Koji Matsuoka Signed-off-by: Simon Horman Signed-off-by: Yoshihiro Kaneko --- This patch is against master branch of linuxtv.org/media_tree.git. v3 [Yoshihiro Kaneko] * fixes the detection of RGB input v2 [Yoshihiro Kaneko] * remove unused definition as suggested by Sergei Shtylyov * use VNMC_INF_RGB888 directly instead of VNMC_INF_RGB_MASK as a bit-field mask drivers/media/platform/soc_camera/rcar_vin.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 20defcb..18ce4bd 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -74,6 +74,7 @@ #define VNMC_INF_YUV10_BT656 (2 << 16) #define VNMC_INF_YUV10_BT601 (3 << 16) #define VNMC_INF_YUV16 (5 << 16) +#define VNMC_INF_RGB888 (6 << 16) #define VNMC_VUP (1 << 10) #define VNMC_IM_ODD (0 << 3) #define VNMC_IM_ODD_EVEN (1 << 3) @@ -272,6 +273,10 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) /* input interface */ switch (icd->current_fmt->code) { + case V4L2_MBUS_FMT_RGB888_1X24: + /* BT.601/BT.709 24-bit RGB-888 */ + vnmc |= VNMC_INF_RGB888; + break; case V4L2_MBUS_FMT_YUYV8_1X16: /* BT.601/BT.1358 16bit YCbCr422 */ vnmc |= VNMC_INF_YUV16; @@ -331,6 +336,15 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) if (output_is_yuv) vnmc |= VNMC_BPS; + /* + * The above assumes YUV input, toggle BPS for RGB input. + * RGB inputs can be detected by checking that the most-significant + * two bits of INF are set. This corresponds to the bits + * set in VNMC_INF_RGB888. + */ + if ((vnmc & VNMC_INF_RGB888)) == VNMC_INF_RGB888) + vnmc ^= VNMC_BPS; + /* progressive or interlaced mode */ interrupts = progressive ? VNIE_FIE | VNIE_EFE : VNIE_EFE; @@ -1013,6 +1027,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx, case V4L2_MBUS_FMT_YUYV8_1X16: case V4L2_MBUS_FMT_YUYV8_2X8: case V4L2_MBUS_FMT_YUYV10_2X10: + case V4L2_MBUS_FMT_RGB888_1X24: if (cam->extra_fmt) break;