From patchwork Wed Jul 25 16:38:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todor Tomov X-Patchwork-Id: 142880 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1029676ljj; Wed, 25 Jul 2018 09:40:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpexD5xCEeDK6/JY8CZcnNykJp8+hwqD81qUW/pemIxSIHTqRS5B3AKe8w5T5d6FmNCtRTUv X-Received: by 2002:a17:902:b28c:: with SMTP id u12-v6mr21387818plr.16.1532536833615; Wed, 25 Jul 2018 09:40:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532536833; cv=none; d=google.com; s=arc-20160816; b=POrstjhcfDOx1PNCjqdMjpCrDmNR8tVv/DZfF93G4jY/9wj3E3V+UQej2H1n74qJLS y4ZP6R31odE2/3JBYqiqcYWiiJFjjaK4m3qNrNWNSL6Ka2pSdlxufQD8UC6GNFI892aV YJ5bpJV8LVZz3Gi/mp+NDiKH8c1LxzKf18iRjWQGSyvgac4E4DqyF2HyKJr/4NVLH+MG AXJdkFSvoqMX2+L3gkX+MazQ9GqZIoPfoP9Spqepazi9/1JA42Z1xto1X0SzVi83uPSa XRc6lzmbzQLc5xyq2Qo8I9c4mxmJ0i7RodPZ2f2lRApGV9H+9WBzHfYNKRCJsUvX4bns +yNw== 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=dMUfmvUYOlfSx3koWQ3rEzs4813B1eWDrCxle4t5R0o=; b=k6fy64950Yqokx1qBDlW6uoVdKfrWnCwHgMXssTaACMEFfjlXt2R3EPBok8bSiyBwA V+9iqH2aWmsfS6zfFs+0UIa2RhnvcxBFpWVlzm6Om9oNtlFNea7qPXwNJniSHDNRLNR9 dsfFSkbdgut/iMFXSN0cX4Lp4TMGSzYZMvB7TuEO5x4Kont3pC7Tbo9E6NM9F4G0WO4D pqiqYwuQDveBbKmPeny5lPUPX2bpp5x0Zftv7l9M6VYgbJi6SjnC25jOWAab1S+uZmXp NzS4xczBG6PmMU64Fsdjp0IIDAUUxWGdeMu+Ng10jksZqQpzWjeH+0L//GnKp0Id87dU dz7g== 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 d1-v6si13254975pld.515.2018.07.25.09.40.33; Wed, 25 Jul 2018 09:40:33 -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 S1730492AbeGYRv2 (ORCPT + 31 others); Wed, 25 Jul 2018 13:51:28 -0400 Received: from ns.mm-sol.com ([37.157.136.199]:35649 "EHLO extserv.mm-sol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730269AbeGYRv2 (ORCPT ); Wed, 25 Jul 2018 13:51:28 -0400 Received: from mms-0439.qualcomm.mm-sol.com (unknown [37.157.136.206]) by extserv.mm-sol.com (Postfix) with ESMTPSA id BABF8CD6F; Wed, 25 Jul 2018 19:38:54 +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 v4 29/34] media: camss: csid: Different format support on source pad Date: Wed, 25 Jul 2018 19:38:38 +0300 Message-Id: <1532536723-19062-30-git-send-email-todor.tomov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532536723-19062-1-git-send-email-todor.tomov@linaro.org> References: <1532536723-19062-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 db960da..cf543fa 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, @@ -674,15 +715,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++) @@ -716,7 +757,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) @@ -725,13 +765,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;