From patchwork Tue Jun 6 23:37:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 41659 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIO2o-0002eR-N7; Tue, 06 Jun 2017 23:37:50 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.89/mailfrontend-7) with esmtp id 1dIO2m-0005ME-1m; Wed, 07 Jun 2017 01:37:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751471AbdFFXhp (ORCPT + 1 other); Tue, 6 Jun 2017 19:37:45 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:36273 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751437AbdFFXho (ORCPT ); Tue, 6 Jun 2017 19:37:44 -0400 Received: by mail-pf0-f176.google.com with SMTP id x63so4908116pff.3 for ; Tue, 06 Jun 2017 16:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yEuKtgJuQN3UH6FifWa7fmuH3Pjur6fDr+gBUB2NU+w=; b=MYvCMc5ivxa0YGZcHxrdoT0WC67Tl6P9a/iXCeZKPp7sfbRJpMmnoYapWXIiNtKzkp rOxJkwCYI450OTTacDfRE/DWAFsapaCn/Jv3mL0yV9eo5re/91FmVavVqkNxbOmpJhgw BuVpksNk7cLmOulErTW0B0/lNs18q+zHWqSmC3N6va3eCIha3P5y3uXE4HTrZY4Vy8sS aGEmxl70CjYg6BWzJ+IlTZpfNWWAdTCX1TZEEsdIomta7Aojh6XG8s+IeLC/C5566xj4 4xQHieNDFIxBSPAopj/cP3mbeV76e1LvprVOTiODmvuDtmERhab1P5MWuASOOiEJS3eG mj2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yEuKtgJuQN3UH6FifWa7fmuH3Pjur6fDr+gBUB2NU+w=; b=H/io3qIRNg+QeonPGUK8L9sPEw4tFHYDr7UuvgVClYS2ADUStLLrvoe1raFJKG5FHY qojdO7Vf6NewisS3BNbwdPQ8r2xjw5sY2Ylf1g8rkf6hFTihhbukQP9H697DRj6ULDWS pmBLmW36CthR5BAeBTyyzZC3DkHFsPBD+23VZpqhayzyebu8YtOjNPg6DZOBungPAGkG 3W2CryJJprM0WJU73xgK/DL7eja5JhZr15hAfQjg7fXITyqZ9j/Yvs+xEN0vkt4Mvd4z NVAiHRlmOWmz1i6l1VAM7QsObO4/0LC1LaJSLCjezkIuhmX+Csuev1DLbH3apLLAEuNY nwtg== X-Gm-Message-State: AODbwcBfwgGNvixiCwvwK5NVj6+MxeWTOhrqb3ZtuNEDqLS/JxmS1xWm yGfIatBCZPBbqNLB X-Received: by 10.84.209.236 with SMTP id y99mr24226017plh.198.1496792263640; Tue, 06 Jun 2017 16:37:43 -0700 (PDT) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id g86sm1804649pfk.101.2017.06.06.16.37.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 16:37:43 -0700 (PDT) From: Kevin Hilman To: Hans Verkuil , Laurent Pinchart , linux-media@vger.kernel.org Cc: Sekhar Nori , David Lechner , Patrick Titiano , Benoit Parrot , Prabhakar Lad , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/4] [media] davinci: vpif_capture: drop compliance hack Date: Tue, 6 Jun 2017 16:37:38 -0700 Message-Id: <20170606233741.26718-2-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170606233741.26718-1-khilman@baylibre.com> References: <20170606233741.26718-1-khilman@baylibre.com> MIME-Version: 1.0 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: 2017.6.6.233317 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1700_1799 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_MEDIA_BODY 0, __CTE 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Capture driver silently overrides pixel format with a hack (according to the comments) to pass v4l2 compliance tests. This isn't needed for normal functionality, and works for composite video and raw camera capture without. In addition, the hack assumes that it only supports raw capture with a single format (SBGGR8) which isn't true. VPIF can also capture 10- and 12-bit raw formats as well. Forthcoming patches will enable VPIF input with raw-camera support and has been tested with 10-bit format from the aptina,mt9v032 sensor. Any compliance failures should be fixed with a real fix. Signed-off-by: Kevin Hilman --- drivers/media/platform/davinci/vpif_capture.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 128e92d1dd5a..fc5c7622660c 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -936,21 +936,6 @@ static int vpif_try_fmt_vid_cap(struct file *file, void *priv, struct channel_obj *ch = video_get_drvdata(vdev); struct v4l2_pix_format *pixfmt = &fmt->fmt.pix; struct common_obj *common = &(ch->common[VPIF_VIDEO_INDEX]); - struct vpif_params *vpif_params = &ch->vpifparams; - - /* - * to supress v4l-compliance warnings silently correct - * the pixelformat - */ - if (vpif_params->iface.if_type == VPIF_IF_RAW_BAYER) { - if (pixfmt->pixelformat != V4L2_PIX_FMT_SBGGR8) - pixfmt->pixelformat = V4L2_PIX_FMT_SBGGR8; - } else { - if (pixfmt->pixelformat != V4L2_PIX_FMT_NV16) - pixfmt->pixelformat = V4L2_PIX_FMT_NV16; - } - - common->fmt.fmt.pix.pixelformat = pixfmt->pixelformat; vpif_update_std_info(ch);