From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BEFD22FA0D3 for ; Fri, 26 Sep 2025 13:11:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758892305; cv=none; b=N6j9mkgs7SwSMvopGRHXxvm+Xhge7mPbK1XvWiOfcwtrCI9D5NMg1Ggu+551f6yL1Q/ff68E4dYvMdduNA4HtQp5qQNP/O8xrkTF5SoB34Zai2FMsbKBny85SpuhnU701u6Xttl2ZGCjYwgfQh0r1Hqm5VzZlUgJHTTg4HW7WdE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758892305; c=relaxed/simple; bh=yNrpERf5BIoxndB/IrDgg7F9IXcRYdRqRLfZtrmT8XA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A0XI4AYML8M85nYaaKOo4x5sFy2ZiMDziwbsTKPQY0o4r4MtYWp2yPwdVFsNxFdBWPR8gMTxUzRNMr1brvL+ir4PHVzxU9vcFL3zqbuaC7dGhWpOH9RewKhULdZDm7MFAZB4A6lIdT+DzPCmnLzQXpA6XSMCR5+QbZVBsWqOUlo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=FS/SKx5K; arc=none smtp.client-ip=209.85.167.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="FS/SKx5K" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-57da66e0dc9so2162453e87.0 for ; Fri, 26 Sep 2025 06:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1758892296; x=1759497096; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=cjB3MTX3Joa1/7HOctJXxE5CXor1VUYeSlxA+suqIgI=; b=FS/SKx5KlPs+jWLyH4wmJlgYY2EAyt5dORj4RnuYMdbpynQ/AkDgAZJjXC9Ylt/RLC AosBVdJq9E1M/RmODFDre9MaRmNiRBDpP/njUiRMqbitzjlgXMrrhjUd9AbC5rsTZ4lO +nYyunniXwcWawYBCOPp955C6FmII0OMEjbD0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758892296; x=1759497096; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cjB3MTX3Joa1/7HOctJXxE5CXor1VUYeSlxA+suqIgI=; b=CdFUIooW+/dGC0zMKms+yWrQg7VTjaxipzCvC4ndZgh1UkxkamnNSYe9nVH82gNLkS b5X7xN8JPw/KxiSAHg6qjgv+13sG+4kPWuhCW4sTIdeDUwj8OZvA0X0oRq3m9faqnsMd wjSOs7FbC+EfpukjX7ZDlbZc5Wx7xxHHzq6AgMbSKKj7WksSOntn96Kqu7+GNoHXxuo9 VhKIin51I2mYlLKJq2iBUEyCIvwdiBbR5D2GnybTPDN+SaJpJTP+nvgVcJXS2Aq37e8G qVMl+a2GKI6ytG+HpZ40uDl9fPU2dpIg6c64yghFOYb1QNvZzhtlS+kMG3K42tDoIfkO T03w== X-Forwarded-Encrypted: i=1; AJvYcCXQ12cugutX+uJ8cS++i5cvuvQ5hHhshyioVtMTckQNcWcXZI2tG4Ffs2IDBT+WMMJxUnsH4Bpzes1s@vger.kernel.org X-Gm-Message-State: AOJu0Yz+V2lM/fNwrxPBPt7xO9yL4Yp9rWtJ9dEb5jXUTsPF9XRYZvPb YesrqIlAlYEpNBo6v1ruhAASUxqxkUSM3EbTgga1tL9X2WSh2jXzsq96yXFYXrDTYw== X-Gm-Gg: ASbGncvMjS1pYgXgTzTWmrG/n39yTm/6K8SnKCq8rCMCu7J7QQTBpSKX0/XyshH1QfY BDTHLqUkZNzc0hAolmk1EL4uV8r5nq1R3L7vo8zX0JUa9dHsaosW2K5RhKf/u39+UK49V50RdIu SSePLvKPy6LvKvEtzvw6CxEAZv9ApidJdyazQGa12QACtWPr0kTtMP2EqhT9O55OqG0IwXrCADm LB3cef7nEKGdrteYUyqBqaUex2ZMNPOZV60XN3szrl4ZwyQmdOOe3eA+ipmD+W93sbFnGkBqHBx +RNxImb8W2gHVOczYWPEYGZVQJxRZMJ3lLv5nlxw5sCV71bjohn+Pgs6VXlKxcX1U1SEpLvJ1nd HUBM9+w/sO3RuaxegoTOtCdeBk0fkNeu9TzW01VxWiYI99brpYAseR3+l+oZOipcNIIkIzFtFr0 Z1x9PUukhAzk0p X-Google-Smtp-Source: AGHT+IHWNSHIhM8+wxqoK25vYQcpiuX3y8F3tCAqdPjxFUiAxRPF90tmVAHpAHEn0gJRDF4m3ruBAg== X-Received: by 2002:a05:6512:234f:b0:57b:7c83:d33b with SMTP id 2adb3069b0e04-582d34eab93mr2494739e87.47.1758892296391; Fri, 26 Sep 2025 06:11:36 -0700 (PDT) Received: from ribalda.c.googlers.com (64.153.228.35.bc.googleusercontent.com. [35.228.153.64]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-58527c6b014sm123872e87.43.2025.09.26.06.11.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Sep 2025 06:11:36 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 26 Sep 2025 13:11:35 +0000 Subject: [PATCH v3 11/12] media: uvcvideo: Use current_value for read-only controls Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250926-uvc-orientation-v3-11-6dc2fa5b4220@chromium.org> References: <20250926-uvc-orientation-v3-0-6dc2fa5b4220@chromium.org> In-Reply-To: <20250926-uvc-orientation-v3-0-6dc2fa5b4220@chromium.org> To: Hans de Goede , Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown , Robert Moore , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev, Ricardo Ribalda X-Mailer: b4 0.14.2 For read-only controls that do not support GET_MIN, GET_DEF, GET_MAX or GET_RES use the current value of the control or a constant number if the current value is not available. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 76 +++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 017165a5c94459f1befd4c08f85a2017c58d61e6..e99fdf4bafbea662556798fe345a48b9ffd8467b 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1548,6 +1548,50 @@ static u32 uvc_get_ctrl_bitmap(struct uvc_control *ctrl, return ~0; } +static s64 uvc_queryctrl_single_boundary(struct uvc_video_chain *chain, + struct uvc_control *ctrl, + struct uvc_control_mapping *mapping, + u8 op) +{ + static const u32 query_types[][3] = { + {UVC_CTRL_FLAG_GET_DEF, UVC_GET_DEF, UVC_CTRL_DATA_DEF}, + {UVC_CTRL_FLAG_GET_MIN, UVC_GET_MIN, UVC_CTRL_DATA_MIN}, + {UVC_CTRL_FLAG_GET_MAX, UVC_GET_MAX, UVC_CTRL_DATA_MAX}, + {UVC_CTRL_FLAG_GET_RES, UVC_GET_RES, UVC_CTRL_DATA_RES}, + }; + int idx = -1; + + for (unsigned int i = 0; i < ARRAY_SIZE(query_types); i++) { + if (op == query_types[i][1]) { + idx = i; + break; + } + } + if (WARN_ON(idx == -1)) + return 0; + + if (ctrl->info.flags & query_types[idx][0]) { + return uvc_mapping_get_s32(mapping, query_types[idx][1], + uvc_ctrl_data(ctrl, + query_types[idx][2])); + } + + /* Use 1 as the default step value. */ + if (op == UVC_GET_RES) + return 1; + + /* Read-only controls can use GET_CUR as min, max and def. */ + if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) && + (ctrl->info.flags & UVC_CTRL_FLAG_GET_CUR) && + __uvc_ctrl_load_cur(chain, ctrl) == 0) { + return uvc_mapping_get_s32(mapping, UVC_GET_CUR, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); + } + + /* Otherwise, use 0 as last resource. */ + return 0; +} + /* * Maximum retry count to avoid spurious errors with controls. Increasing this * value does no seem to produce better results in the tested hardware. @@ -1573,11 +1617,9 @@ static int __uvc_queryctrl_boundaries(struct uvc_video_chain *chain, return ret; } - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_DEF) - v4l2_ctrl->default_value = uvc_mapping_get_s32(mapping, - UVC_GET_DEF, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_DEF)); - else - v4l2_ctrl->default_value = 0; + v4l2_ctrl->default_value = + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_DEF); switch (mapping->v4l2_type) { case V4L2_CTRL_TYPE_MENU: @@ -1608,23 +1650,17 @@ static int __uvc_queryctrl_boundaries(struct uvc_video_chain *chain, break; } - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MIN) - v4l2_ctrl->minimum = uvc_mapping_get_s32(mapping, UVC_GET_MIN, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MIN)); - else - v4l2_ctrl->minimum = 0; + v4l2_ctrl->minimum = + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_MIN); - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MAX) - v4l2_ctrl->maximum = uvc_mapping_get_s32(mapping, UVC_GET_MAX, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); - else - v4l2_ctrl->maximum = 0; + v4l2_ctrl->maximum = + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_MAX); - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) - v4l2_ctrl->step = uvc_mapping_get_s32(mapping, UVC_GET_RES, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); - else - v4l2_ctrl->step = 0; + v4l2_ctrl->step = + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_RES); return 0; } -- 2.51.0.536.g15c5d4f767-goog