Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp5723835imw; Wed, 20 Jul 2022 11:08:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sLlHV668p8LFXtcJ00LTS0R/ET40iiWvrwU0dF9beB7FEmq0DJm/dnMU1jn9PsGSuahcTW X-Received: by 2002:a63:5906:0:b0:415:d2a2:f938 with SMTP id n6-20020a635906000000b00415d2a2f938mr34057687pgb.244.1658340508972; Wed, 20 Jul 2022 11:08:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658340508; cv=none; d=google.com; s=arc-20160816; b=MaeDtHTiAUm2rHtU5CthU+WhQmlNc9PwaJjGg4PDHp1Z+TnxMXiJHbvoFZOVyPmKys dynH7GZjZmVXt6TaKo19c/XqE4ofWT3tzYuVPUsF2yvkKcTed70eDL/1o/Ingp52mxab aQOR2t6nufVfemeMJfGSJli06yJyrVe01CZa72q8f8UQ8eKW1UpKGfODipHZ4sYlUzzv ziOnkkQ334hWauEUQ7RlJUtKQPwIwdw9c+hcYnr/93ZrBdOUcu++J+VDqeBJuCMCeW+c NxAFoMpSAby3Wb81svgGj4YKATtWjEwQ7oOpSToiloW21I5UAlgsCsa75BP+MPr6QHBt 43BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=yfDJUTfvr3d5I4twOHTbOmaJjh1hit1g2h1jqNCaLTk=; b=u2cl7dP9wTXXeaKsfmYUyIArjNO/d2BCrzZuAAFov4qoDAiPwi7v0kXaRbHzAkTy9W dKVkT/cyWty5JlDwa/kDkd+UVmt/edc5TrXzFDH2IAhZtnoVhR528WX7avMpXUktzhGa gq7cC2qEi7B7NH/kqcje7a+y+1WJAgEJ5aCsiykNAS5kafTCY2XOUAR8coysUs+Lz9zn JaDvUCXoBkJF3McgNFyy3QeA6zunxFaD3i80zgusxFynN4I0FTI0ka4vWvKAoyd3pCI0 jdtpTrWG2lb6OmxY06pC8QdsvAizbP7+3E4aAmdOJmKXkJwb5+9BC8FBjxktadcfmeki 9L0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=TEXeCjaR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f23-20020a17090ace1700b001efe6abbc37si3076234pju.32.2022.07.20.11.08.13; Wed, 20 Jul 2022 11:08:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=TEXeCjaR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239202AbiGTRWv (ORCPT + 99 others); Wed, 20 Jul 2022 13:22:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbiGTRWt (ORCPT ); Wed, 20 Jul 2022 13:22:49 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C50B13F332; Wed, 20 Jul 2022 10:22:48 -0700 (PDT) Received: from pyrite.rasen.tech (softbank036240121080.bbtec.net [36.240.121.80]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B38AC6DB; Wed, 20 Jul 2022 19:22:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1658337766; bh=cdhTFwAUWu0BfU4pY0Qx+ICqevNTT6nB/e0kgl797cc=; h=From:To:Cc:Subject:Date:From; b=TEXeCjaR2aW8XsTlPI5AgJxKkEneJwOgJEzZGHwHRc13Rp1YG3xJGwiCDtL/IMsrb lz88eHiL+fzSblDMj2gTWiuY1hEcNNYd1kVqXw8bqz/y64+DmIMkXevKdRkxN8kZ0C yLmHbsIYYLkfynThQ/rnXeZGAEXNdBLxLsXvnMWo= From: Paul Elder To: linux-media@vger.kernel.org Cc: Paul Elder , Dafna Hirschfeld , Mauro Carvalho Chehab , Heiko Stuebner , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, laurent.pinchart@ideasonboard.com Subject: [PATCH] media: rkisp1: Implement ENUM_FRAMESIZES Date: Thu, 21 Jul 2022 02:22:31 +0900 Message-Id: <20220720172231.4019063-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement VIDIOC_ENUM_FRAMESIZES for the rkisp1 capture devices. Signed-off-by: Paul Elder --- .../platform/rockchip/rkisp1/rkisp1-capture.c | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c index c494afbc21b4..74106a01ded7 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c @@ -1245,6 +1245,31 @@ static int rkisp1_enum_fmt_vid_cap_mplane(struct file *file, void *priv, return -EINVAL; } +static int rkisp1_enum_framesizes(struct file *file, void *fh, + struct v4l2_frmsizeenum *fsize) +{ + struct rkisp1_capture *cap = video_drvdata(file); + const unsigned int max_widths[] = { RKISP1_RSZ_MP_SRC_MAX_WIDTH, + RKISP1_RSZ_SP_SRC_MAX_WIDTH }; + const unsigned int max_heights[] = { RKISP1_RSZ_MP_SRC_MAX_HEIGHT, + RKISP1_RSZ_SP_SRC_MAX_HEIGHT}; + + if (fsize->index != 0) + return -EINVAL; + + fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE; + + fsize->stepwise.min_width = RKISP1_RSZ_SRC_MIN_WIDTH; + fsize->stepwise.max_width = max_widths[cap->id]; + fsize->stepwise.step_width = 2; + + fsize->stepwise.min_height = RKISP1_RSZ_SRC_MIN_HEIGHT; + fsize->stepwise.max_height = max_heights[cap->id]; + fsize->stepwise.step_height = 2; + + return 0; +} + static int rkisp1_s_fmt_vid_cap_mplane(struct file *file, void *priv, struct v4l2_format *f) { @@ -1294,6 +1319,7 @@ static const struct v4l2_ioctl_ops rkisp1_v4l2_ioctl_ops = { .vidioc_s_fmt_vid_cap_mplane = rkisp1_s_fmt_vid_cap_mplane, .vidioc_g_fmt_vid_cap_mplane = rkisp1_g_fmt_vid_cap_mplane, .vidioc_enum_fmt_vid_cap = rkisp1_enum_fmt_vid_cap_mplane, + .vidioc_enum_framesizes = rkisp1_enum_framesizes, .vidioc_querycap = rkisp1_querycap, .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, -- 2.30.2