From patchwork Fri Aug 14 20:54:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 247744 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp677882ilo; Fri, 14 Aug 2020 13:54:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2+gqjdbJ9+NjMpZ/n6+H/k+DySDGq6Dy/JoGgXw2ylq8HfzYPUuFWm1uDOoyd5B/z7ySS X-Received: by 2002:a17:906:95d4:: with SMTP id n20mr4409097ejy.485.1597438485889; Fri, 14 Aug 2020 13:54:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597438485; cv=none; d=google.com; s=arc-20160816; b=0alY+9EQwKYhLMZqft08afedSitaJJn+yF4H2tdUqyVGInLO4V18ztv+PDjIONH7VU QVycx7LYIvhJGsXtHZVCj+EcpCjrjDi7pok0eZSM/WZe5Wr7mY4gl4oZLS+azMX4fAYI tOtY2dFDgmKMpMxcLVc/OsCfJ7S1V7xGCbTcGms3F0LO89GMsHx3ZbmRpFHQ0uJ1qLdn GrF0EK/eCD/Fz/c1aSQRN4AMttb1rKQ4oxGYVbn9vOo4u46SeMAwo8ydbSkEWbZu8lRn yU29PerM45gm4fReW5MTnkNu3I/V7qhsu6+KaEK4C6EfH8J2Lr4D+mR5Ndr6GilHQ8l/ znTA== 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:dkim-signature; bh=v89y35h3M88vGCG82awEg4tCgwfd/R9LYLHd6BNE3bg=; b=nxT2+cH1UANk67Ta7T8INbGSgsWUeAbG9FYUThBo6/a6CQ/uWUmX9fXpfkYkBifWXb Cwi9Bv39uOU9TowNplj+yfwtaq9xojQS8+5gEHY9zzkOb06Ue016YSGIt8VgFy/IGzH5 1+qFXVAM5MZnLDvFQoYCPM/AVu39+XXmJepTjGFPTNlc7H/5vFcA0RgYqsMsLa/gDbHC Zbo8XwUoAsiK+t12/SzVdCaPZtQAfyRFzMjNXvLrl06lxKYjPYnbmpsw23CZ5a47hIbS T43TTdPW/ef+JrihRufxQiKsUWbDjlgriz6B0cu4VlsX4oNHmAHPBNv3Yc5M0d25doyt ufOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zGNVIsk2; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e2si6054935edv.492.2020.08.14.13.54.45; Fri, 14 Aug 2020 13:54:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zGNVIsk2; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726959AbgHNUyp (ORCPT + 15 others); Fri, 14 Aug 2020 16:54:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726754AbgHNUyo (ORCPT ); Fri, 14 Aug 2020 16:54:44 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F1D7C061385 for ; Fri, 14 Aug 2020 13:54:44 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id 185so11285812ljj.7 for ; Fri, 14 Aug 2020 13:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v89y35h3M88vGCG82awEg4tCgwfd/R9LYLHd6BNE3bg=; b=zGNVIsk2UmezNjaacj6ZypLaT5Bq7Jyj+EEMu+EN1MV38GUHIl+wGgeeuxuDawQ59s 7T1GYsqddFaBhluXp+1SA+uB+Iuv8GDHj0bfHBRLcDbq/kw4K0ejctkugyWLTTZRSG4I TTKKHDq2J2u5sRpVPbO/Nk7R79mk3mAUefX8+c/1a2oNV3f1Kx7Gdn9kUcaCkMofGxQd VIWqOcuinBP4ljiSPry2ldG5lnPIgG8ms1ekRZ3Jk23uuHq+faNndyy/nSOQGHIO12Ts fqEhKoQ8/6V3vB85lIR76zfcqprhAomvy50AsQfQ0+3f7UNlE/sgd2LAwQvaxpDDV1sM iBrg== 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; bh=v89y35h3M88vGCG82awEg4tCgwfd/R9LYLHd6BNE3bg=; b=Y+hSo6WMyPkJVAxvGTkguuD8PyZIBrIz4ysHmGPqUByz32nQPqlzXXgChDBn5hRL94 ekwaEcsksCmpPJUaBtoDavnbp1+85Pj8kgeli6FWtVsZng1x4VzKL09Ojs7xwzHaiFTe dcYuWQY+tzVcvsLbv0ZW8m8ICitp+OVcrjAuArxKODeDnfnYOEwrQ4EspTxRDzCOHUbk Ql7X9S0EjpjjsYqEcHEkGLADrMAIZfSIPQcy9rOpGQnnJc8DtfVcFq5qQmEYCE3W9sZx jNfDC4P2c82gRwKCgpbDKqi6HP/RV5ZXyWgpYgxCIyyPJ1kKkjOcBhAQ4PODe3SlhtRZ 3xvQ== X-Gm-Message-State: AOAM530837C2GHM8AU8QFciEwx0IFlB1s+uvgF4A6MZNKIr/UnUykeTk vK54s4JC8SzuwhoIv8Py5/aLUA== X-Received: by 2002:a2e:90e:: with SMTP id 14mr2141399ljj.293.1597438483038; Fri, 14 Aug 2020 13:54:43 -0700 (PDT) Received: from localhost.localdomain (37-144-159-139.broadband.corbina.ru. [37.144.159.139]) by smtp.googlemail.com with ESMTPSA id j26sm1963601lja.111.2020.08.14.13.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 13:54:42 -0700 (PDT) From: Andrey Konovalov To: mchehab@kernel.org, robert.foss@linaro.org Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, peter.griffin@linaro.org, Andrey Konovalov Subject: [PATCH 1/3] media: camss: Make use of V4L2_CAP_IO_MC Date: Fri, 14 Aug 2020 23:54:01 +0300 Message-Id: <20200814205403.27639-2-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200814205403.27639-1-andrey.konovalov@linaro.org> References: <20200814205403.27639-1-andrey.konovalov@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Implement mbus_code filtering for format enumeration. Without this patch libcamera errors out with: "ERROR V4L2 v4l2_videodevice.cpp:982 /dev/video0[cap]: Media bus code filtering not supported by the device" Signed-off-by: Andrey Konovalov --- .../media/platform/qcom/camss/camss-video.c | 67 +++++++++++++++---- 1 file changed, 54 insertions(+), 13 deletions(-) -- 2.17.1 diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c index cdbd6dba1122..90c7dd29b573 100644 --- a/drivers/media/platform/qcom/camss/camss-video.c +++ b/drivers/media/platform/qcom/camss/camss-video.c @@ -529,17 +529,16 @@ static int video_querycap(struct file *file, void *fh, return 0; } -static int video_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f) +/* + * Returns the index in the video->formats[] array of the element which + * has the "ndx"th unique value of pixelformat field. + * If not found (no more unique pixelformat's) returns -EINVAL. + */ +static int video_get_unique_pixelformat_by_index(struct camss_video *video, + int ndx) { - struct camss_video *video = video_drvdata(file); int i, j, k; - if (f->type != video->type) - return -EINVAL; - - if (f->index >= video->nformats) - return -EINVAL; - /* find index "i" of "k"th unique pixelformat in formats array */ k = -1; for (i = 0; i < video->nformats; i++) { @@ -552,11 +551,53 @@ static int video_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f) if (j == i) k++; - if (k == f->index) - break; + if (k == ndx) + return i; + } + + return -EINVAL; +} + +/* + * Returns the index in the video->formats[] array of the element which + * has code equal to mcode. + * If not found returns -EINVAL. + */ +static int video_get_pixelformat_by_mbus_code(struct camss_video *video, + u32 mcode) +{ + int i; + + for (i = 0; i < video->nformats; i++) { + if (video->formats[i].code == mcode) + return i; + } + + return -EINVAL; +} + +static int video_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f) +{ + struct camss_video *video = video_drvdata(file); + int i; + + if (f->type != video->type) + return -EINVAL; + + if (f->index >= video->nformats) + return -EINVAL; + + if (f->mbus_code) { + /* Each entry in formats[] table has unique mbus_code */ + if (f->index > 0) + return -EINVAL; + + i = video_get_pixelformat_by_mbus_code(video, f->mbus_code); + } else { + i = video_get_unique_pixelformat_by_index(video, f->index); } - if (k < f->index) + if (i < 0) return -EINVAL; f->pixelformat = video->formats[i].pixelformat; @@ -911,8 +952,8 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev, } vdev->fops = &msm_vid_fops; - vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_STREAMING | - V4L2_CAP_READWRITE; + vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_STREAMING + | V4L2_CAP_READWRITE | V4L2_CAP_IO_MC; vdev->ioctl_ops = &msm_vid_ioctl_ops; vdev->release = msm_video_release; vdev->v4l2_dev = v4l2_dev;