From patchwork Fri Dec 2 16:07:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Kharuk X-Patchwork-Id: 630415 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB07FC4708E for ; Fri, 2 Dec 2022 16:07:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233505AbiLBQH6 (ORCPT ); Fri, 2 Dec 2022 11:07:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233412AbiLBQHz (ORCPT ); Fri, 2 Dec 2022 11:07:55 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9737126AC8 for ; Fri, 2 Dec 2022 08:07:53 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id ml11so12614834ejb.6 for ; Fri, 02 Dec 2022 08:07:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=melexis.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lN7SLbrO6IRiwLkabai6Yk1jGwDx04yNJ/i+Pt05kbI=; b=ouAx3zIYJo87/9kuuvnJZWrLXDYN/kBd8D+5aRKdCbEd1dmRsXWjsiR3wzgdhXK6Ye DIeWzb6nM1n9s4HS0bVBZVnzMRykDMdu/R5T16y7L2CnknQAlqbInPP0F2ymzdtF/Jdj SM1uDNeAMfGTTJWejfosCvi3BEHw8jmaCVBLCo/2zkJzz1+qiWp3jalmbXTRQ/IrSu25 wDWsS+qD+bcX6qxI2mi1iu4pO05i1aXCYwXvassyXivDC8ZKTHtp/Bbrxte4ans6t61v 6Bx4hf5sS+iyuVGGjYaChvf3aitP4H2aZhsIa85/MwxfmlRUYnNW280P5azwhRS2wFVA Vjgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lN7SLbrO6IRiwLkabai6Yk1jGwDx04yNJ/i+Pt05kbI=; b=ktyTc8DODaBnE+ONVGe98DvoEMep2MTF53j6LBF9JhofhT18m0+IG2LxaJRQ7onOGm D/FivOcQG39M9v6uNGOL+d9tP76GNiCugp7OrfngW5/tq+caicnm1f7JUFUHhIVLt6Jv pjkkxqj0aCFQPHWu53c8YQXCT0kXTnvhyWG2GSlbWmumF0bLaBZEyc1B8QjGuzvWK3bR y2iuP5wOgMsn2eREo9ZsJkC4hjPSVP3plGDWH0ygxclw813WsaM1XLwLcsUU7qnoXV3c 5b9bXqGSFlsJN+Zv6BIal5LyH5zLEZbE6AMGUf2f/NNSBnwuEiZniYagNqe70AUp/05g /o0Q== X-Gm-Message-State: ANoB5pkVGZKCYp/UvviCJGjEcJje0caw3qqzCRqaCSN01Na0JliyeUPJ P4DwKK2YrSs1hLB+c1h4KEKl7Q== X-Google-Smtp-Source: AA0mqf7lH3dyya87BXasWaVfLkxyri8QF91SYPgtl7mldNw+Q68cRubykpXAJ1K8uaie15A9hC8TEw== X-Received: by 2002:a17:906:b108:b0:7b5:dd3e:69c1 with SMTP id u8-20020a170906b10800b007b5dd3e69c1mr44864435ejy.381.1669997272146; Fri, 02 Dec 2022 08:07:52 -0800 (PST) Received: from melexis ([91.192.183.26]) by smtp.gmail.com with ESMTPSA id o7-20020a056402444700b0044dbecdcd29sm1668210edb.12.2022.12.02.08.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 08:07:51 -0800 (PST) From: Volodymyr Kharuk To: Cc: Andrii Kyselov , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Laurent Pinchart , devicetree@vger.kernel.org, Hans Verkuil , Sakari Ailus , Benjamin Mugnier , Volodymyr Kharuk Subject: [PATCH v4 4/8] media: v4l: ctrls-api: Allow array update in __v4l2_ctrl_modify_range Date: Fri, 2 Dec 2022 18:07:34 +0200 Message-Id: X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org For V4L2_CID_TOF_TINT, which is dynamic array, it is required to use __v4l2_ctrl_modify_range. So the idea is to use type_ops instead of u64 from union. It will allow to work with any type. Signed-off-by: Volodymyr Kharuk --- drivers/media/v4l2-core/v4l2-ctrls-api.c | 25 ++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c index d0a3aa3806fb..ebe57ec72813 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c @@ -933,17 +933,18 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl, lockdep_assert_held(ctrl->handler->lock); switch (ctrl->type) { + case V4L2_CTRL_TYPE_MENU: + case V4L2_CTRL_TYPE_INTEGER_MENU: + if (ctrl->is_array) + return -EINVAL; + fallthrough; case V4L2_CTRL_TYPE_INTEGER: case V4L2_CTRL_TYPE_INTEGER64: case V4L2_CTRL_TYPE_BOOLEAN: - case V4L2_CTRL_TYPE_MENU: - case V4L2_CTRL_TYPE_INTEGER_MENU: case V4L2_CTRL_TYPE_BITMASK: case V4L2_CTRL_TYPE_U8: case V4L2_CTRL_TYPE_U16: case V4L2_CTRL_TYPE_U32: - if (ctrl->is_array) - return -EINVAL; ret = check_range(ctrl->type, min, max, step, def); if (ret) return ret; @@ -961,16 +962,16 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl, } cur_to_new(ctrl); if (validate_new(ctrl, ctrl->p_new)) { - if (ctrl->type == V4L2_CTRL_TYPE_INTEGER64) - *ctrl->p_new.p_s64 = def; - else - *ctrl->p_new.p_s32 = def; + WARN_ON(ctrl->is_array); /* This shouldn't happen, as + * INTEGER/Ux/BOOLEAN/BITMASK will not + * return an error. + * In case it happened, all array will + * set to default value + */ + ctrl->type_ops->init(ctrl, 0, ctrl->p_new); } - if (ctrl->type == V4L2_CTRL_TYPE_INTEGER64) - value_changed = *ctrl->p_new.p_s64 != *ctrl->p_cur.p_s64; - else - value_changed = *ctrl->p_new.p_s32 != *ctrl->p_cur.p_s32; + value_changed = !ctrl->type_ops->equal(ctrl, ctrl->p_cur, ctrl->p_new); if (value_changed) ret = set_ctrl(NULL, ctrl, V4L2_EVENT_CTRL_CH_RANGE); else if (range_changed)