From patchwork Mon Jul 23 11:02:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todor Tomov X-Patchwork-Id: 142580 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5910581ljj; Mon, 23 Jul 2018 04:05:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf4UWj6ZscnV9ZkBxTjaS0xiSz9DqVFwyM06KhOXPd69IJoi8Ex6rZbOOWRAmzVhpjmwVzk X-Received: by 2002:a17:902:7106:: with SMTP id a6-v6mr12765606pll.28.1532343913747; Mon, 23 Jul 2018 04:05:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532343913; cv=none; d=google.com; s=arc-20160816; b=k0wV7lYsT2F50i8FmLiuey9GbNtvxgQUyOiYEDPS+QuqDwPW5pcz/m5iWeLB+CQLiz zDjBkI2pADNJNNgjhbW4XYnobRO69Q/lHxwZj8u+liwcMb6MoK8HPbuduf2OLr39sHkg jQAkEqbdDYl3aRAcaAn3OkwVCB+g+nkInXEfreXmbhMZe3P4haccDN4ava9N2ayTO/Ua nLS0kkjMZBUqVfzme8KC+8OgeqkL9TRrWLuIsDD43/+eVjSS+VCZz2gEaa78oEioS9Yh C+kPFnqrCURPV7Jd86ssbX6yZSc6nG/gnJf1Ulf0zpi5afdY7l3pTkjqz6iATC+3zYPE o1YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=/0zbqYLNFsQQ3QU3eKP1MvJifNzJfL7MK+KdTdCNW30=; b=cymBPMfCNJW8bpoY9S37d8K1/cbG6bQ/S1qjlHnMRAwineFVVrd1HfvpyM1SNaEP9B 7MHP14U2a3uki0kC0JYzoo89LkGKoxEqFURhCCHbtqt43qbBBb70OfDU1B/z9nHa8S4Y eZWOjduIoGRDOf/rT8jMW6GEDJ4oJ6MZEjlZgWccNQO/RxHAD7DHFfJurs3w/Bm3WcBe 0B3VDjrBWGk7073GmLS2grG5+zkTN1EAZeIh7OGTJbR841/03+i2LOLFqDeGsCQr+5xu MTS4O2cCy02Lo0CRgkkpSUQGIewr36Yl2y0n2xOzaKRu0M3oc18yLS/oy+OIikH1LHCw c7OA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f23-v6si8978731plj.494.2018.07.23.04.05.13; Mon, 23 Jul 2018 04:05:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388363AbeGWMFu (ORCPT + 31 others); Mon, 23 Jul 2018 08:05:50 -0400 Received: from ns.mm-sol.com ([37.157.136.199]:39960 "EHLO extserv.mm-sol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388169AbeGWMEt (ORCPT ); Mon, 23 Jul 2018 08:04:49 -0400 Received: from mms-0439.qualcomm.mm-sol.com (unknown [37.157.136.206]) by extserv.mm-sol.com (Postfix) with ESMTPSA id 2487FCD6C; Mon, 23 Jul 2018 14:04:03 +0300 (EEST) From: Todor Tomov To: mchehab@kernel.org, sakari.ailus@linux.intel.com, hans.verkuil@cisco.com, laurent.pinchart+renesas@ideasonboard.com, linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Todor Tomov Subject: [PATCH v3 29/35] media: camss: csid: Different format support on source pad Date: Mon, 23 Jul 2018 14:02:46 +0300 Message-Id: <1532343772-27382-30-git-send-email-todor.tomov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532343772-27382-1-git-send-email-todor.tomov@linaro.org> References: <1532343772-27382-1-git-send-email-todor.tomov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Usually the format on the source pad is the same as on the sink pad. However the CSID is able to do some format conversions. To support this make the format on the source pad selectable amongst a list of formats. This list can be different for each sink pad format. This is still not used but will be when the format conversions are implemented. Signed-off-by: Todor Tomov --- drivers/media/platform/qcom/camss/camss-csid.c | 69 +++++++++++++++++++++----- 1 file changed, 56 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c index 18420e3..8fd7909 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -300,6 +300,47 @@ static const struct csid_format csid_formats_8x96[] = { } }; +static u32 csid_find_code(u32 *code, unsigned int n_code, + unsigned int index, u32 req_code) +{ + int i; + + if (!req_code && (index >= n_code)) + return 0; + + for (i = 0; i < n_code; i++) + if (req_code) { + if (req_code == code[i]) + return req_code; + } else { + if (i == index) + return code[i]; + } + + return code[0]; +} + +static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code, + unsigned int index, u32 src_req_code) +{ + if (csid->camss->version == CAMSS_8x16) { + if (index > 0) + return 0; + + return sink_code; + } else if (csid->camss->version == CAMSS_8x96) { + switch (sink_code) { + default: + if (index > 0) + return 0; + + return sink_code; + } + } else { + return 0; + } +} + static const struct csid_format *csid_get_fmt_entry( const struct csid_format *formats, unsigned int nformat, @@ -667,15 +708,15 @@ static void csid_try_format(struct csid_device *csid, case MSM_CSID_PAD_SRC: if (csid->testgen_mode->cur.val == 0) { - /* Test generator is disabled, keep pad formats */ - /* in sync - set and return a format same as sink pad */ - struct v4l2_mbus_framefmt format; + /* Test generator is disabled, */ + /* keep pad formats in sync */ + u32 code = fmt->code; - format = *__csid_get_format(csid, cfg, - MSM_CSID_PAD_SINK, which); - *fmt = format; + *fmt = *__csid_get_format(csid, cfg, + MSM_CSID_PAD_SINK, which); + fmt->code = csid_src_pad_code(csid, fmt->code, 0, code); } else { - /* Test generator is enabled, set format on source*/ + /* Test generator is enabled, set format on source */ /* pad to allow test generator usage */ for (i = 0; i < csid->nformats; i++) @@ -709,7 +750,6 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_mbus_code_enum *code) { struct csid_device *csid = v4l2_get_subdevdata(sd); - struct v4l2_mbus_framefmt *format; if (code->pad == MSM_CSID_PAD_SINK) { if (code->index >= csid->nformats) @@ -718,13 +758,16 @@ static int csid_enum_mbus_code(struct v4l2_subdev *sd, code->code = csid->formats[code->index].code; } else { if (csid->testgen_mode->cur.val == 0) { - if (code->index > 0) - return -EINVAL; + struct v4l2_mbus_framefmt *sink_fmt; - format = __csid_get_format(csid, cfg, MSM_CSID_PAD_SINK, - code->which); + sink_fmt = __csid_get_format(csid, cfg, + MSM_CSID_PAD_SINK, + code->which); - code->code = format->code; + code->code = csid_src_pad_code(csid, sink_fmt->code, + code->index, 0); + if (!code->code) + return -EINVAL; } else { if (code->index >= csid->nformats) return -EINVAL;