From nobody Wed Oct 1 23:30:05 2025 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 CBAEB2F60DA for ; Fri, 26 Sep 2025 13:11:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758892304; cv=none; b=NhYSJI9ueY20N5JGFMCgraDh3KRggM6ld/JlNo3LVb+C8pPSgg99rzRTJNO43RoHavwbY++PuhbQNcQ4d00pYr8YBEbWOpOrfXfcpsWuPhe9SOjO1gfIISOiPImTMwXaULKfyTQQHrCKEFj3lGIDcmbmj7o4BNYgs4uUSGhd5gE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758892304; c=relaxed/simple; bh=yNrpERf5BIoxndB/IrDgg7F9IXcRYdRqRLfZtrmT8XA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dgcTji7bGjqgRtcOq+hb3z5LKqoZ93XjO+ZDVENzRT4C7/0VI2eaVEd6llWBpwN9Nt3tEWFGYV6AISLMtnsPltGoio8K/1/2qDoUJrUcadc5hhMYjSRdAF1mQRdcfyJ+lFhI3w7/Gn6c9Onycw0+YIVs6E7Tyx9wL1QFkEEqyG8= 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.48 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-f48.google.com with SMTP id 2adb3069b0e04-57da66e0dc9so2162452e87.0 for ; Fri, 26 Sep 2025 06:11:38 -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=wpIv1apTH/oChZyKMJNdR9KWu9p+G0+ONHREs+BTaGHs9wkQiaUibRctwhQzITjgeA XRUJPIz+HrVLW/vxJqEGxOM/CZAz3zWvYIF/7FCqS4z9Kx9emFhY1tMLqGhf3VT/JW8I k+WCEM5FdDr+MwTdhZgxwcL2OE4oUI4zI0/jyaJbZj2mW1OEWPvVQuHHHgs9EI4jT+x1 V9v6YEEyzYQ227x9+HN/J3GrAOYDVmvGdwoPkaqrzNaYPByK7TiiQZAntGQxPaJICLnx fQa+wN01jtyWgNYy/eMWL8lKwtdKpbtWySvAZi6fuQfhGu7lyC3np4Yuxp4tc7EoqLd9 TJ7w== X-Forwarded-Encrypted: i=1; AJvYcCXxo5jYyS3c7PmAxWYkAZlkIJ6/1ltoy9ZuT457SVu+/qq/bw28bTuhsiqY4gxOktycJ588X1GD1jUWmwE=@vger.kernel.org X-Gm-Message-State: AOJu0YwCnqkfxYVFdsu4uenpFYu5rXUf5B5GiqY/6JUUKFQ3td06mEZt INN4c9g71O/YcO6Ta/4xw6XxI5wJOOvmOeeZBiahE1msXzEfmY0oiem8lgOAwP50dQ== X-Gm-Gg: ASbGnctHIwkA8aINkR5meUxZ+8a/y+XpuI+fWnKkiydTI2/zbRbrmQkFDM92qbFyp4j YuIs8kahnzxaNNGc7rRF1Hw3N7TgwxITkFw2T0TkKvQ6T4A0l5LlSQ/Z7Irz0xYPx7qF1HOGjCz DSHmLNlYDAmU5zQCmDivLAShCbS9SJQYhXADtiDKXRGzBxVrEeuKfHOOCNvzy1D7LaDJJOynNzl jxIsoq+0QWlBpwEruWNQkep0xv6AHWGbt5OpP45Ea8+ug8zP2CN6xknn9pXRM/rHjkmvGjtlRn6 5hnhXr+du2otmlCsXT6XbxFHh8tqEkIz2iKoBc+VH8M+Fi21scv6V142ao8G78QjdRG5nF8m1l4 JSHlfwetw31jLDdyUDpB+Zg65SmqWZ/vWi6M6OQ3PONK10KzIGiacZWPpKiirjcjQd5I2aHzgSV /hplk6OpGsYMIm 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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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_c= trl.c index 017165a5c94459f1befd4c08f85a2017c58d61e6..e99fdf4bafbea662556798fe345= a48b9ffd8467b 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 *c= trl, return ~0; } =20 +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] =3D { + {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 =3D -1; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(query_types); i++) { + if (op =3D=3D query_types[i][1]) { + idx =3D i; + break; + } + } + if (WARN_ON(idx =3D=3D -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 =3D=3D 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) =3D=3D 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_vid= eo_chain *chain, return ret; } =20 - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_DEF) - v4l2_ctrl->default_value =3D uvc_mapping_get_s32(mapping, - UVC_GET_DEF, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_DEF)); - else - v4l2_ctrl->default_value =3D 0; + v4l2_ctrl->default_value =3D + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_DEF); =20 switch (mapping->v4l2_type) { case V4L2_CTRL_TYPE_MENU: @@ -1608,23 +1650,17 @@ static int __uvc_queryctrl_boundaries(struct uvc_vi= deo_chain *chain, break; } =20 - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MIN) - v4l2_ctrl->minimum =3D uvc_mapping_get_s32(mapping, UVC_GET_MIN, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MIN)); - else - v4l2_ctrl->minimum =3D 0; + v4l2_ctrl->minimum =3D + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_MIN); =20 - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MAX) - v4l2_ctrl->maximum =3D uvc_mapping_get_s32(mapping, UVC_GET_MAX, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); - else - v4l2_ctrl->maximum =3D 0; + v4l2_ctrl->maximum =3D + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_MAX); =20 - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) - v4l2_ctrl->step =3D uvc_mapping_get_s32(mapping, UVC_GET_RES, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); - else - v4l2_ctrl->step =3D 0; + v4l2_ctrl->step =3D + uvc_queryctrl_single_boundary(chain, ctrl, mapping, + UVC_GET_RES); =20 return 0; } --=20 2.51.0.536.g15c5d4f767-goog