From patchwork Thu Jun 5 17:52:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 895241 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 118E0279780 for ; Thu, 5 Jun 2025 17:53:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145987; cv=none; b=ArP2Cx6HwOTxnt4aQ2IIUZA3qavB5xtCbAyy/gF1clCeBRE4RQLC350gHWVlofRZykThHESwMaTUMt8+tLFbvjyPnyZxfxvQlVZQtqBNNTCLLIZacq7zkaa5yZ2O0y/PMUIaDXmtr54HGsnYGWMZBlT/E5E9IAflFJJLpXvz1/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145987; c=relaxed/simple; bh=tewb45+dzAe3tLBQsQaB+O4zKZphuKqtE9IM4Y6OX9M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ukBX1//XAVUy3Y6fgUdHtAyJ2HCYtgAd/mgpvXhvCiAvzU9ijfYr92E1A/jJ3NIfK0sujwcpnPCO45u8dtIrOPtXPLD5O4BpcYZsNg4g0ehhKLTLCJ0xiBBkc9KZqTMDjoCGq7rbYv74dn8cXiPdYaswBiR7Vrp4SuWUf6JTxu4= 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=ZVkCRHEm; arc=none smtp.client-ip=209.85.167.50 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="ZVkCRHEm" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-553644b8f56so638727e87.1 for ; Thu, 05 Jun 2025 10:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145983; x=1749750783; 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=K2bzjHeaOe4XJQH7wCz0q9lsz5fFHI+NR6J/UEFEZdQ=; b=ZVkCRHEmBSMwAVs2r4H6mCqw7kB5h/HMviCkeWJwBrW4ZC8SnUK2Ug2FJB9zOV/PRa 3yprm3m92Yf3jKNQHX2hv+vxVW36LQN/Qx2gkIo6Xf8evy9FIF6EVPgBXSp+IZObtOSz OWYhDVEBzWScLF1rid461YU5MTRNttPiSBucI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145983; x=1749750783; 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=K2bzjHeaOe4XJQH7wCz0q9lsz5fFHI+NR6J/UEFEZdQ=; b=dozErgpMvrwYXdrkBonI3Hi0qMYeCvdv4uzSWppSMDyeF30JRCc06WlWBn9Er54BcG zFJFKJhJnBstkuWxaNY4D7YAmxOzsygdyQRGxALpAyi21ELsq/kYFF+G/m9xmA1izr4Z XA3PWRfy4WLI6qcrAjFJIw1p8N+ISTjgcJRgjXZCMZPrqiFOcxgNRrjxdYylOWKLPMyR UmfkwhFxTZII0rezcfD5SDfuZ/X5lgwfOqrmu+uGZGZZy8HyglZI1IPUbuvA/pn9/gL5 SojJ16egF+1KtWHtAmZICujnAGgYs+emLY70RCMYZ1T3LzEGsb86L5KYEgiVXolfW1tg fvBg== X-Forwarded-Encrypted: i=1; AJvYcCXu4R0pv2mydv9g1YhFj/+5iTmqFosx3xHF0hF2QT1ZnV03ykTjo5RCmz/MPWJXJm2lnK8EIjSkQpC9@vger.kernel.org X-Gm-Message-State: AOJu0YyKzF+vXEUjwVX1ME6rQYE++e/EwQ2i4H1GPSKR+sBYNzjRRN9J bZrqjjSz+4aC8w4TvlyuN2tbm53zuNL3q/ip74OtimfaLKNgGt8L6kxjlpxZKuRMOw== X-Gm-Gg: ASbGncu3ZJ4N27nv61vNosFxANPQtwEUYsnROw7f2JWhVlE6JEurLQXDtd3zHbXgT5s 54ZCG6oBciwyP6VHoUcy1BU7LainzHwhz66XKOzWBU6VHr/gQTcl0KVfW6h6VyImhRsiW3FfDRT VpovaV3ZnjtBH0yZI28T2fHMAQQdoiCE6d4dp/uEkdSqqe+Rj1gY3pij+LLAZslPuYLnmGU7+K6 C591/D7lJaCqoR+1oUajcyRo97xRdbp2Vu5C9v6dUQPYLujqYBY+roY/xwBkBO425pUkS9/kZO1 AmkoHxh6W7NEd4hbzpk9ltjrcKAvusR1a8utpo15Zo/iMP8vVXV0oQRzH/5N7B8P9z4427amdYV oPvXYUpmsEaFVVSWFgVqeuNLUDg== X-Google-Smtp-Source: AGHT+IGl548xQa/vsHY27xBCLqMA/WtFSSEsFfeQt2Dzb0VNl43ck1yHu+ccC0nfMKcjxfgnvusB5Q== X-Received: by 2002:a05:6512:1248:b0:553:2cc1:2bb4 with SMTP id 2adb3069b0e04-55366bd49dcmr18752e87.12.1749145983043; Thu, 05 Jun 2025 10:53:03 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:02 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:52:54 +0000 Subject: [PATCH v2 01/12] media: uvcvideo: Always set default_value Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-1-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 If the control does not support GET_DEF, the field default_value will be left uninitialized during queryctrl. Fixes: c0efd232929c ("V4L/DVB (8145a): USB Video Class driver") Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 44b6513c526421943bb9841fb53dc5f8e9f93f02..47e8ccc39234d1769384b55539a21df07f3d57c7 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1497,6 +1497,8 @@ static int __uvc_queryctrl_boundaries(struct uvc_video_chain *chain, 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; } switch (mapping->v4l2_type) { From patchwork Thu Jun 5 17:52:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 895239 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 1E0C72797BE for ; Thu, 5 Jun 2025 17:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145990; cv=none; b=Ijc0lrCSzNZmjvDxZcpO1nKCICOaDsfUX5LqvO1DmvItkOEhgo8H0R9DQK/s2jBWpfyR0ZROTvVByESHQYzrX7eaVU9IdjkcennGqBYzHpub0UiOEsb3o+6vFf6ckbANE2LLdixTTelzLvoQAtBDJ6qC3+OwRz2w8Hpn8OoGyEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145990; c=relaxed/simple; bh=eN2NqpRnpXYpl4E3GCmZNzKt19bmwjyh05by15ZauKc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iJrjdRMuyyVEC3ze9l6vYAtxef9css9ZaaaxAYn1IgjXdhFXQiGhHu93jrt/tCwBzuiUc+5/nWht6a+LeTp0zzuzp+12ScAV7QkmGQFIlDX18JucJe58zt4lYgpg5lstEQ9AT0BQ9N4f/RbnbrlHzTqjk8sFi4ygDpkXGSVcuoA= 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=Q9SfuKhf; arc=none smtp.client-ip=209.85.167.46 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="Q9SfuKhf" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-551efd86048so1376034e87.3 for ; Thu, 05 Jun 2025 10:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145984; x=1749750784; 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=1/BKOipaa0AeDKKmUIkRbQ0YnQTBaMveRhFI1BloNvM=; b=Q9SfuKhflYnlcPWMjOga76HYIaNOo02cO//qVkzvyO8fknsjawD9AYiFXh36Ow56+6 8E3FJ9Nx/kMata0brO30hXR9hlcObkNkTqc58bnjj/nimFv6eoTBUUTmH8x4CUV3u16A Tj1keHwAJLI2q9QkggPCcwKa9mf+lxhP88p1w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145984; x=1749750784; 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=1/BKOipaa0AeDKKmUIkRbQ0YnQTBaMveRhFI1BloNvM=; b=jy1OQRcl7I1vXNnouLda+UJhT6MBEvDqBehpsZSfcQmZ9puo7gu80WDWTGEHrFd/kK gaGvhRMqHaqbdPq60IcuXEQmxLJbvTIgmy+qz7B3Sb1y9c8cEinSnWC0+FgOt+gSzvO6 UznPvcjaAYnrzQ0csFm0xMVBXpz58BzGC3V62cxljqzaeam8jsKpdKo8lpmdtR7X3Cy9 7qy0/XmP8ak+2C2f7O34Ip32U7myL/w++6ZdiInp0pXhOzi9y76v4jBWpGGCvaFQ8cgq HY6xJfk3Qj4OQT+H/bq22rhkVIeKZo0rhVWA+S5sdf3mZyTzqcMNWPEAg/LKwE70mSOu vz9A== X-Forwarded-Encrypted: i=1; AJvYcCUt+fNFnNAh1tqV1slY2ArfOlx9/itW3vzhX9HDVlw7b7MUk/jIqCg+LOLDwRg83vqa/gpthOubPUgK@vger.kernel.org X-Gm-Message-State: AOJu0YxjkATgIbAiAbczZcqKSHQBurFmI3DnuIcJTA3lmu+MkqXvWMXd kZ8iyUyR2Kmvdwb/WVDIb7qYo4UUoBYQpM+gtEGJr9+6fHzQjU/Nto/+yQEcHA6T7w== X-Gm-Gg: ASbGncsAsitgnOtq5avMMgYW79WJrESUSr+YulTaCodHgq88bUgdzUW9Nu7KkLlQ529 e0bZxTv1mXWYpALNc2LQjW8kfOhjQLwE2JnSTLfPfL4CdH3ZKibudNSI0T8McfOip88sDd2jAhB f2PERy7dZbEONV3fTJvN8WvNsnDGacmBxU/QZ7cRKkv89REfplYueslNSmsM80TEc+LVYqKGyQz lEJTLm9KN6OOp5XoBWU9tbC1hsXa8qsLU7Bxvsp3G0oOhgr+yoI6xeHvT+8LZGDP0kJszVJLUGl eXE3zhzp648a1Atd6oIyFZh5rKOnEPtYNxJlHrw6yZ0M6Zv04angDn8u+K0zuoeVV5KN+AZSCWI 6Oy5HHN5BLx1uSIDeNInwSTlkug== X-Google-Smtp-Source: AGHT+IFdxuqyfHnNl8OVH+/gLEAeEElSe/53dZeUw33MEGW+QrVTJwknGhZW8Toc3Ow5cY8PaKjVgQ== X-Received: by 2002:a05:6512:1289:b0:553:3892:5eaa with SMTP id 2adb3069b0e04-55366c38b6amr15211e87.55.1749145983869; Thu, 05 Jun 2025 10:53:03 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:03 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:52:55 +0000 Subject: [PATCH v2 02/12] media: v4l: fwnode: Support ACPI's _PLD for v4l2_fwnode_device_parse Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-2-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 Currently v4l2_fwnode_device_parse() obtains the orientation and rotation via fwnode properties. Extend the function to support as well ACPI devices with _PLD info. We give a higher priority to fwnode, because it might contain quirks injected via swnodes. Signed-off-by: Ricardo Ribalda --- drivers/media/v4l2-core/v4l2-fwnode.c | 85 ++++++++++++++++++++++++++++++++--- 1 file changed, 79 insertions(+), 6 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index cb153ce42c45d69600a3ec4e59a5584d7e791a2a..379290ab3cfde74c8f663d61837a9a95011b5ae0 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -15,6 +15,7 @@ * Author: Guennadi Liakhovetski */ #include +#include #include #include #include @@ -807,16 +808,65 @@ int v4l2_fwnode_connector_add_link(struct fwnode_handle *fwnode, } EXPORT_SYMBOL_GPL(v4l2_fwnode_connector_add_link); -int v4l2_fwnode_device_parse(struct device *dev, - struct v4l2_fwnode_device_properties *props) +static int v4l2_fwnode_device_parse_acpi(struct device *dev, + struct v4l2_fwnode_device_properties *props) +{ + struct acpi_pld_info *pld; + int ret = 0; + + if (!is_acpi_device_node(dev_fwnode(dev))) + return 0; + + if (!acpi_get_physical_device_location(ACPI_HANDLE(dev), &pld)) { + dev_dbg(dev, "acpi _PLD call failed\n"); + return 0; + } + + if (props->orientation != V4L2_FWNODE_PROPERTY_UNSET) { + switch (pld->panel) { + case ACPI_PLD_PANEL_FRONT: + props->orientation = V4L2_FWNODE_ORIENTATION_FRONT; + break; + case ACPI_PLD_PANEL_BACK: + props->orientation = V4L2_FWNODE_ORIENTATION_BACK; + break; + case ACPI_PLD_PANEL_TOP: + case ACPI_PLD_PANEL_LEFT: + case ACPI_PLD_PANEL_RIGHT: + case ACPI_PLD_PANEL_UNKNOWN: + props->orientation = V4L2_FWNODE_ORIENTATION_EXTERNAL; + break; + default: + dev_dbg(dev, "Unknown _PLD panel val %d\n", pld->panel); + ret = -EINVAL; + goto done; + } + } + + if (props->rotation != V4L2_FWNODE_PROPERTY_UNSET) { + switch (pld->rotation) { + case 0 ... 7: + props->rotation = pld->rotation * 45; + break; + default: + dev_dbg(dev, "Unknown _PLD rotation val %d\n", pld->panel); + ret = -EINVAL; + goto done; + } + } + +done: + ACPI_FREE(pld); + return ret; +} + +static int v4l2_fwnode_device_parse_dt(struct device *dev, + struct v4l2_fwnode_device_properties *props) { struct fwnode_handle *fwnode = dev_fwnode(dev); u32 val; int ret; - memset(props, 0, sizeof(*props)); - - props->orientation = V4L2_FWNODE_PROPERTY_UNSET; ret = fwnode_property_read_u32(fwnode, "orientation", &val); if (!ret) { switch (val) { @@ -833,7 +883,6 @@ int v4l2_fwnode_device_parse(struct device *dev, dev_dbg(dev, "device orientation: %u\n", val); } - props->rotation = V4L2_FWNODE_PROPERTY_UNSET; ret = fwnode_property_read_u32(fwnode, "rotation", &val); if (!ret) { if (val >= 360) { @@ -847,6 +896,30 @@ int v4l2_fwnode_device_parse(struct device *dev, return 0; } + +int v4l2_fwnode_device_parse(struct device *dev, + struct v4l2_fwnode_device_properties *props) +{ + int ret; + + memset(props, 0, sizeof(*props)); + + props->orientation = V4L2_FWNODE_PROPERTY_UNSET; + props->rotation = V4L2_FWNODE_PROPERTY_UNSET; + + /* Start by looking into swnodes and dt. */ + ret = v4l2_fwnode_device_parse_dt(dev, props); + if (ret) + return ret; + + /* Orientation and rotation found!, we are ready. */ + if (props->orientation != V4L2_FWNODE_PROPERTY_UNSET && + props->rotation != V4L2_FWNODE_PROPERTY_UNSET) + return 0; + + /* Let's check the acpi table. */ + return v4l2_fwnode_device_parse_acpi(dev, props); +} EXPORT_SYMBOL_GPL(v4l2_fwnode_device_parse); /* From patchwork Thu Jun 5 17:52:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 895240 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 55DB0279915 for ; Thu, 5 Jun 2025 17:53:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145989; cv=none; b=CvA9uqjmHPfVNEpgsCx/scMhCVBOHIQZLS0mHvDcxlaCewDzlSasLYKOLyPOvSPj7D9l/ie814Dz7yqeXLRB0pMHMhxTcdYkUVjJ31n+Z8QhpavFHDDfdGYLzTIuydLOvY1ljDXEUHeWSCN5zjJsQIbLtgzPD9r3i6kYBshvCWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145989; c=relaxed/simple; bh=V3mF7pLDoaruyqIzAwwMyJdM0YQYzWL05/erg95lnDI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=anW6CH3UAA0hemT+6qLptp2Cid/KMAFCUgh3VDqIBxJ+PITD3KZEYSZ5gfmMODZ1Wc1u9GO1ESdiNvHkoTwqhfAH2evTheUYkfryk4QLZQ/fknKxxCmhxRcvvWdvIuMs0nCJGHZxrVDyaifhdkd3J6H9W+qRKlYIvP2EW22aRUI= 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=ETjM1jqi; arc=none smtp.client-ip=209.85.167.54 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="ETjM1jqi" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-551fc6d4a76so1309689e87.0 for ; Thu, 05 Jun 2025 10:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145984; x=1749750784; 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=W8OIPxZw+kNtaX9XsRliFjEOnUVpjIedNlprBesFBFM=; b=ETjM1jqiveXzdwPDQFMdlninWX7WCzWyBBTNVcW8rRYgpQ9RBIljJU1/Z4o4pYaX/E ho9z0jjgKf6qSxZ5fghWCD/nUGaOdMY0r3O5cfwPsx6FHPvxDVWfvcfWQgD956eFgjyj gwNfHRFdK2iaQ2xUr6iRIhtPpoIHBQRoN6HSM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145984; x=1749750784; 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=W8OIPxZw+kNtaX9XsRliFjEOnUVpjIedNlprBesFBFM=; b=r3sCgax+Bra0iRMErRB0CCmwjY45nbJ8oG5QLQci/ktqXmLUSE+wccPWd4zb8cMHsx 7dLBdF9TzfqWN/9b8ju02uIqFXx4Ul45zsyuR9wkM0suRe34J+NtgTioC0EaPQTfzMgh aKgJXWSYR3JHhpcodAfkz6MBIRjz55aSKax3vwoVZAoCvQkJy6mNIpCePpHXo7qm29xt c3K99oSs4sQrHGEd2WmB2omdKxBk2MawQ3Yc/h0ND8rZ3245FJZ1U7LeBkgewg/w0VBj TAPMsG25QiNBvQsQpoT46wSNsJoyiYQTkX0HgolWL7KYsH+7aMqjJElfcLDsCANMTTbS 6qyg== X-Forwarded-Encrypted: i=1; AJvYcCWo/WwZ1P5Lt0sLcdW+EOQKVfZcqJ7065lukOJO0eYWoP6LsCaPnQjD3AFGrZRaCTmnbFyZD85b1CVF@vger.kernel.org X-Gm-Message-State: AOJu0YyVrAmJ9q6QcWtAyQF1DZP6Dvtn8Ci8vRHi1eL85CvqqJQDlW96 IwFPlYblKX1FVEQo1L2JO29AEqu/aXyBaD2Ue5w6ChVtbDThMOQKYkLSuQkcfNMKOw== X-Gm-Gg: ASbGnctU7S91jpYwVNWPJZqCpLpmhLjWLbgN64A/xv3mYd0PXPgEjN0orT5DfAHHOaO bZdZ1HrEbq2iamI0tGhNiEfL711utxlULsiB5FS2+Bi3D1c/RiIMgusdwsSWehNHvON05hxuyjp t0yvFprdr4QT00xzs+ePSnH9NP7E2oeodKrvN1E71mW0iHpjPqRqKkPSTeSl6YvHow/XkKggaKC rMJFfheJ22V21yLKBAT9MmoARxyT0z49xRKJt4bMOgoI7oRkVwrCTiA40/ZoAotL5awi867kAl8 xB/elxNksxpwIZxkTUfySGXeGitf1u0Ni7+TQUNY8o3DQu1QTf+U/7wJwZflB0Y+FfXpGmKbEJt 9N29I37eq3Sn3XofLCgADpGBgN7/XKxg4i9k3WBCzbbs76hE= X-Google-Smtp-Source: AGHT+IGs54mK0grF5GpYvNrIRBVyl5RIQTl5wT33xEXZ6lSNp2Qm87PtJXgiSarLAOoqtbFmQtgqJA== X-Received: by 2002:a05:6512:224b:b0:553:2bf2:e303 with SMTP id 2adb3069b0e04-55366bf9034mr20502e87.30.1749145984304; Thu, 05 Jun 2025 10:53:04 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:04 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:52:56 +0000 Subject: [PATCH v2 03/12] ACPI: mipi-disco-img: Do not duplicate rotation info into swnodes Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-3-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 The function v4l2_fwnode_device_parse() is not capable of parsint the _PLD method, there is no need to duplicate the rotation information in a swnode. Signed-off-by: Ricardo Ribalda --- drivers/acpi/mipi-disco-img.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/acpi/mipi-disco-img.c b/drivers/acpi/mipi-disco-img.c index 5b85989f96beeb726f59ac9e12e965a215fb38f6..b58b5ba22a47a4afc5212998074d322f0b7586dc 100644 --- a/drivers/acpi/mipi-disco-img.c +++ b/drivers/acpi/mipi-disco-img.c @@ -617,21 +617,6 @@ static void init_crs_csi2_swnodes(struct crs_csi2 *csi2) adev_fwnode = acpi_fwnode_handle(adev); - /* - * If the "rotation" property is not present, but _PLD is there, - * evaluate it to get the "rotation" value. - */ - if (!fwnode_property_present(adev_fwnode, "rotation")) { - struct acpi_pld_info *pld; - - if (acpi_get_physical_device_location(handle, &pld)) { - swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] = - PROPERTY_ENTRY_U32("rotation", - pld->rotation * 45U); - kfree(pld); - } - } - if (!fwnode_property_read_u32(adev_fwnode, "mipi-img-clock-frequency", &val)) swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_CLOCK_FREQUENCY)] = PROPERTY_ENTRY_U32("clock-frequency", val); From patchwork Thu Jun 5 17:52:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 894210 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 4564427A123 for ; Thu, 5 Jun 2025 17:53:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145990; cv=none; b=EyZH1D3NGG1mN8FjzFisCFVluFZILYMg31G2Y3ArcCS0hDOH8NsbboEd4+con/CDehUHVPfXfPlTflJiiHnEUuE4fOxOGf4Vwl8qEC21zwsiJW5qfU+53aXvo/reJQdJMZaBbvLPq0CNkvh4iGFJh6Fp+0mc/VMaKnorN8hD/Qk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145990; c=relaxed/simple; bh=HkpzCJY6QMUo/A2tmF9l8NRgkFwGl+Bw/RVcSwiZ3nc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tXOfxUoLnhb8t5VfNmg0zIBuInsRX9nNoazhcq0zUp5UL7+ZWjyKH7ozalDHO6KylwaVKHprfR3sPI5ylPdOeati3h/B093+Lgq2qzqll7gzShnrVGa2CeANBUWM0C8HftfEK0egE3FJXnAQSVANG/Qi521yTPNGPvEEZEZTZU4= 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=mAIbvnSb; arc=none smtp.client-ip=209.85.167.45 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="mAIbvnSb" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5532f9ac219so1512588e87.1 for ; Thu, 05 Jun 2025 10:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145985; x=1749750785; 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=IAddCa1zo14U93p/hxz3tXNuMoufL4dFoj1aELCNFac=; b=mAIbvnSbSujXriDone/jjS4I6hRdXbCA6Sb+MUaRuNWkIv0C+UTJskIZwnosB21vDQ GM5uBqOYGmjZmzBvzcWO3BRwgYvDA47BfeHSLZnpiQTPE8wlGEXSrIfXPI+cTZjNueI2 ac8/+2ZXhvKnXpb3IYUEHaoCIdg3h+8EuvdfE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145985; x=1749750785; 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=IAddCa1zo14U93p/hxz3tXNuMoufL4dFoj1aELCNFac=; b=AdLFxp93qxwUWloFamhKix4SxSt8KqrxwfeHMUZuKMsWlZtOJTrehh9cQtVGOteIWs 7kl/CAB4FcEnS0AmhjBVVsGvuqBUEbzsisBzmnLBr9IBU0zXROqsSj46rX3uYGuWMURK 5+nCde70PHGBMLU87kJqMcqHVqySx+TQVe1HiOe1yRNv8NGW2Fgbx9CJBE2OGyO2UtaV fNgf0ogTldIbpmNKOZ6ThiiSAotRlSAOPs6/JpxDAcb8swpUgdpD5jwId4lV/4n2uk9V yK0a/jcYz6DsQ01pLEKm4mcV7nGbnZrsDjlKmZjzTRmvcAQ4n6hKxbKDGQjBUcohJxaA IVOw== X-Forwarded-Encrypted: i=1; AJvYcCVHkuGq6hcj4Tvo4c9dXZl60WBNjLm7rxR9cZlau9AbWFtGNx+Hz5OCxhNrIfb1wsd9sSuGYLqHlKKh@vger.kernel.org X-Gm-Message-State: AOJu0Yw+PomDuLNdLD8ftTeLeRQjmeBgBUwzW2WB23qDgiRm2TboQK1D lhqtjMbrve8VzWCxHNXRFiOwaa2SoL9eQoQxmeJnBgghoFFDoV/H2xnSByHwQkmoWQ== X-Gm-Gg: ASbGnct3iUDJU3yTHU1KV/bCsYD6RNVzy0LY3qKYKTrkAx2ahCvnCxx8SaDV0RrBhtR 4jhtH39LqjlM7ts7KR6vT1ddQ0C8sGRsPzgiKAjOdllvHaFgAGvuJous8U/kZ5rViKUrkeKeOX5 5+TPwfp01E4cpiBjcou+jMjI8JkjaeCRSjxi6EHUCPBA3ydJL5Wk2iJQFilDIj5Ne4rPjs6pDkU afq3NwkyRAXUdnvmZXZg17ibT6FRxwd1MqDD3I3WiIcWYg17Rx+w26RCCjlZMXL7z9B5NMeOxQ0 Y7tscW1VqjXLohXkgn2Z1xrjnkXMuQCd+b3pkLah7yE19HPL2npwu8K4YydiSfBRbHQkHjjCFjd FcRU0/gMeKZh+wC+gvCJs76F1cg== X-Google-Smtp-Source: AGHT+IEuQ3DoWfSTvrnWbXmxFE5uIRwAzd3dzxpPZvGceJdrS5ZQ7/hUcchLBDj/wBd6vU9oMBKPzQ== X-Received: by 2002:a05:6512:3e0f:b0:553:30fc:cedf with SMTP id 2adb3069b0e04-55366c1ee9emr20515e87.38.1749145984851; Thu, 05 Jun 2025 10:53:04 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:04 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:52:57 +0000 Subject: [PATCH v2 04/12] media: ipu-bridge: Use v4l2_fwnode_device_parse helper Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-4-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 v4l2_fwnode_device_parse now supports acpi devices as well. Use the helper instead of re-implement the logic. Signed-off-by: Ricardo Ribalda --- drivers/media/pci/intel/ipu-bridge.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c index 83e682e1a4b77d9d97b2988750732d0b7c9087b3..020aa52f590d66b6d333adc56ebfb9ab0561db51 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -253,36 +253,16 @@ static u32 ipu_bridge_parse_rotation(struct acpi_device *adev, static enum v4l2_fwnode_orientation ipu_bridge_parse_orientation(struct acpi_device *adev) { - enum v4l2_fwnode_orientation orientation; - struct acpi_pld_info *pld = NULL; + struct v4l2_fwnode_device_properties props; + int ret; - if (!acpi_get_physical_device_location(ACPI_PTR(adev->handle), &pld)) { - dev_warn(ADEV_DEV(adev), "_PLD call failed, using default orientation\n"); + ret = v4l2_fwnode_device_parse(ADEV_DEV(adev), &props); + if (!ret || props.rotation == V4L2_FWNODE_PROPERTY_UNSET) { + dev_warn(ADEV_DEV(adev), "Using default orientation\n"); return V4L2_FWNODE_ORIENTATION_EXTERNAL; } - switch (pld->panel) { - case ACPI_PLD_PANEL_FRONT: - orientation = V4L2_FWNODE_ORIENTATION_FRONT; - break; - case ACPI_PLD_PANEL_BACK: - orientation = V4L2_FWNODE_ORIENTATION_BACK; - break; - case ACPI_PLD_PANEL_TOP: - case ACPI_PLD_PANEL_LEFT: - case ACPI_PLD_PANEL_RIGHT: - case ACPI_PLD_PANEL_UNKNOWN: - orientation = V4L2_FWNODE_ORIENTATION_EXTERNAL; - break; - default: - dev_warn(ADEV_DEV(adev), "Unknown _PLD panel val %d\n", - pld->panel); - orientation = V4L2_FWNODE_ORIENTATION_EXTERNAL; - break; - } - - ACPI_FREE(pld); - return orientation; + return props.orientation; } int ipu_bridge_parse_ssdb(struct acpi_device *adev, struct ipu_sensor *sensor) From patchwork Thu Jun 5 17:52:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 894209 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 7904427A445 for ; Thu, 5 Jun 2025 17:53:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145990; cv=none; b=q3DqxAIRx/PCw/tlTG91s1ro+cjK8B6mu1H0CLfjRj6nmhl6fhCevKYIwwOkFFAzLWMSxl6F9U3EiMf0S9z0jVu9lth/RK6iSMKrgXtO7JYfPcUMu/9dFN7iE9DUAPPuAHWyN4Qfr+Ii/37/l0cvYUCij6TcFsoHGIsindny3dU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145990; c=relaxed/simple; bh=yCJh8xYi8LYreBh5dydvM47XVBLZAxTNUSYJHtb7x4M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XyEcX0/vm8MlJ9UNz6gjYWbxsmlneUk5h4t0ap+10y7bpR7VV5I6iNU4kJfA9JXN09uJYPE3vZtO6mQZMge9AP7xX/OyuzYm1AVUDczer1IGGS3TcSFuY/md01f0dFPdLiZlhCvNWdBYLwtrszg+TNRIUVilfKC35sARWGPb7m4= 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=D1YRJps2; arc=none smtp.client-ip=209.85.167.46 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="D1YRJps2" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-553241d30b3so1176689e87.3 for ; Thu, 05 Jun 2025 10:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145985; x=1749750785; 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=5bWh2ADW8TZRmlfflymQkf2Dq+w112Fwi8JTTMtqDFE=; b=D1YRJps2zRih9coxBVTJrdx/51+lbtjKYRtENATLKOOVOlpyGlG9RH6yDbXUop3PFC Li6dRkgEYA7bQK84Z1zpJ8upk7MmM5j3Fxoi04JNCcAEX2n+XWksq9RUbGaGHLWm1hVk kR7Zn2Yn9TS1/lFia5inydJLM2WAwPacg8Yrs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145985; x=1749750785; 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=5bWh2ADW8TZRmlfflymQkf2Dq+w112Fwi8JTTMtqDFE=; b=UsZff3NdBlO5J8uVTpJddQqgk9GDJYyA+tdXsGfiilsIW6ONBL/0ySg1F96/LP/PtW TLedxmWUhFiyLDCjq0caF/lCT+c9KkOl1ECH5SvPwhP131lbiXjouMsj2DkBz8xElag4 Dxa44m68KlwefaWDOzl9ZI6eURC86Fr8+RS08Pp8Jz2n0BtRhCPvE+sXMoUiEKUqrpqv Tb3coLJENktfq2uzCRk9FXt11hr2jYy0goa97jTz9OpAlZ5gPMc6XeNEodWQlCbU6M97 xnMmflHxb46lssw23HzW0zfkBY3ber4go0/6cT8tTxR0nvwlNEimkjvSqpn1Pi+xemUg Emrg== X-Forwarded-Encrypted: i=1; AJvYcCU7w/OQUCZtytdPN4ADjBDu4P5bA8PicElkQZaDYdxuKCHEIH/Hbn+2rvQbxMcko8aPbTHTJIqKZ86y@vger.kernel.org X-Gm-Message-State: AOJu0YwbkphpurWim8kzKIuRxEsun3l0hfgAQTgzfxbGBa/tES4ztYdP IilbkVaNBOEXeSmnQzSLNcyL/cVttXOnshImAdd6An7qHOEmHJWgE3oucEMiZByjyw== X-Gm-Gg: ASbGnct1HO6dqtSp3A+QQrUGrIjz7hj40IX80PVA8E9r90py3uHRdOvJkqVmmscmK9Q DckdrWLC4BX1FcyvH+5TaZckp9+ZScsVobOfsEGFZoVUgHEVOazvnTS+RVofOX7VdAtKQP6c3kO 0TV9V2tDKkZumiQRBedsnimXcPbRJg7kjP0uQUuEYl2ilDnCQfN+WlXD5+Te5s7XwnERgAVxwAu ETr7vW0rLb2ATEgAqlFgayhukr06RpHlpwpAoWlfgdCQdxw89E2uVKx/l4t0giWzDcrl/PAACLG Xp6V0iJXLnbo2QQN4dE2WZ3U2tqcJAuhcwLfX9uY7AfdzGUqVgdiuhklGKb9q/oAXcSvID55R+C cx06qiP3axs0C4HIhIBeGD+UdcA== X-Google-Smtp-Source: AGHT+IHP/jNThy5aDvW7T/hvxtEAhADh14D+is1JaPoxECZSvFGKZLcZx8jZje+1dqjf1fDgdS/nDw== X-Received: by 2002:a05:6512:2247:b0:553:2dce:3aab with SMTP id 2adb3069b0e04-55366c301f2mr13260e87.40.1749145985423; Thu, 05 Jun 2025 10:53:05 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:05 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:52:58 +0000 Subject: [PATCH v2 05/12] media: ipu-bridge: Use v4l2_fwnode for unknown rotations Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-5-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 The v4l2_fwnode_device_properties contains information about the rotation. Use it if the ssdb data is inconclusive. Signed-off-by: Ricardo Ribalda --- drivers/media/pci/intel/ipu-bridge.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c index 020aa52f590d66b6d333adc56ebfb9ab0561db51..6f436a8b4d23373af8a6668530333a827eca467a 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -236,37 +236,41 @@ static int ipu_bridge_read_acpi_buffer(struct acpi_device *adev, char *id, } static u32 ipu_bridge_parse_rotation(struct acpi_device *adev, - struct ipu_sensor_ssdb *ssdb) + struct ipu_sensor_ssdb *ssdb, + struct v4l2_fwnode_device_properties *props) { switch (ssdb->degree) { case IPU_SENSOR_ROTATION_NORMAL: return 0; case IPU_SENSOR_ROTATION_INVERTED: return 180; - default: + } + + if (props->rotation == V4L2_FWNODE_PROPERTY_UNSET) { dev_warn(ADEV_DEV(adev), "Unknown rotation %d. Assume 0 degree rotation\n", ssdb->degree); return 0; } + + return props->rotation; } -static enum v4l2_fwnode_orientation ipu_bridge_parse_orientation(struct acpi_device *adev) +static enum v4l2_fwnode_orientation +ipu_bridge_parse_orientation(struct acpi_device *adev, + struct v4l2_fwnode_device_properties *props) { - struct v4l2_fwnode_device_properties props; - int ret; - - ret = v4l2_fwnode_device_parse(ADEV_DEV(adev), &props); - if (!ret || props.rotation == V4L2_FWNODE_PROPERTY_UNSET) { + if (props->orientation == V4L2_FWNODE_PROPERTY_UNSET) { dev_warn(ADEV_DEV(adev), "Using default orientation\n"); return V4L2_FWNODE_ORIENTATION_EXTERNAL; } - return props.orientation; + return props->orientation; } int ipu_bridge_parse_ssdb(struct acpi_device *adev, struct ipu_sensor *sensor) { + struct v4l2_fwnode_device_properties props; struct ipu_sensor_ssdb ssdb = {}; int ret; @@ -274,6 +278,10 @@ int ipu_bridge_parse_ssdb(struct acpi_device *adev, struct ipu_sensor *sensor) if (ret) return ret; + ret = v4l2_fwnode_device_parse(ADEV_DEV(adev), &props); + if (ret) + return ret; + if (ssdb.vcmtype > ARRAY_SIZE(ipu_vcm_types)) { dev_warn(ADEV_DEV(adev), "Unknown VCM type %d\n", ssdb.vcmtype); ssdb.vcmtype = 0; @@ -287,8 +295,8 @@ int ipu_bridge_parse_ssdb(struct acpi_device *adev, struct ipu_sensor *sensor) sensor->link = ssdb.link; sensor->lanes = ssdb.lanes; sensor->mclkspeed = ssdb.mclkspeed; - sensor->rotation = ipu_bridge_parse_rotation(adev, &ssdb); - sensor->orientation = ipu_bridge_parse_orientation(adev); + sensor->rotation = ipu_bridge_parse_rotation(adev, &ssdb, &props); + sensor->orientation = ipu_bridge_parse_orientation(adev, &props); if (ssdb.vcmtype) sensor->vcm_type = ipu_vcm_types[ssdb.vcmtype - 1]; From patchwork Thu Jun 5 17:52:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 895238 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 BDFC427A931 for ; Thu, 5 Jun 2025 17:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145991; cv=none; b=lyYoUZ0QmDqt0Fh7A2VuCFDfEr6hQX77+1C303NSYYWSukKfJdvWV0bCJ2GmGim5enbh3y6McPc9XI/CUMakdmfbF0fLqTONseof7qsu0ssplTbHeZO0kCOMKtZCqzZp6WhoYgYXdQJQJnGUic5x2Zr2169ZZr0Tsa6CPG2PIOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145991; c=relaxed/simple; bh=NngJ6Yx0t8C9t8P4XXbFrpgjfgvwAkcfBnBpT4lxGFs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qlM2OTCJw5AVeqXc7kkoiv9OwZt4+g3chHQfpWrM5sLfpaCWFnW5eZtFDV0+Pb3781I2z3u+IpEnUxK4/g+YXRuf3SZ6nubLmW7nrAPR1m7XMFQCoY95utrLdgi0ctISpLIen/AmEutIs/551SXmwvk9u6r0pAKakbHd+r1PvQo= 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=I1VnEq3T; arc=none smtp.client-ip=209.85.167.50 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="I1VnEq3T" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-55350d0eedeso1399641e87.2 for ; Thu, 05 Jun 2025 10:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145986; x=1749750786; 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=Ar8+oEy28CepxnVsr2jEiRDXTfDok/weLPLs5Z9kVHA=; b=I1VnEq3T8ddqhvoQ5NQEukgf98kgl7JFV0+hJFR08RpOZNJJecr1c0dpbMFgc2cV05 0qvwE/NiO1qE7Mp+j7Wh7nVnDoL2Ul0nM8dMnVCvPQiR8V5swuaCtKPfusjdb1M3GaMR wlX1GOuM584IpO1TFQgHjYERmMzoyas7NAhKw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145986; x=1749750786; 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=Ar8+oEy28CepxnVsr2jEiRDXTfDok/weLPLs5Z9kVHA=; b=JORwSSqjcBTpihB9PQVBbVJf2qF06UrBtaWysKENQrgRgM+Q2MCZce1+rqNZQbmZ1a HMjaSUzoU2vL8wCZjzFtqjFRlnnPrZFAHoj3TV/4B6l6Kn3kH+xGpVa9NM/jEpaX0JYa yjHgVsS6PIg4Z6RkMh6qytRopMt88ff1DbTUcHxPikiXdeQ5RQk81VEZhLn6QQz4RmE+ bFkbaxxqQ993926M5EyzJsRrV2tfvWFuZEWPbuPgBrHSigQ6z2ev0wPa9+YJL0bHqBV7 rRh3vJ2oJAO27GKto5i46l5Zyi5jIW/dtkIqRU0LIA+NbGZOg3PO0ITEsV8jF5QyUL8E myxA== X-Forwarded-Encrypted: i=1; AJvYcCUeNUimqar3ikHwIBMIIGKRyCdrQAH+PjbIzg70QKbDJ6xIzONmWfMw72fW2pPGfM1M3lSp1Pb6oH0k@vger.kernel.org X-Gm-Message-State: AOJu0YxB6WwZ+ELXd0UqMBeAwhdHN9serf3/U/M7PiQX7Wj5cM9sNa4X W9Vj4Coz21q9RjmhCGep7yQDH+VB83khy3odNjHmpr5Wi+7A/XWhahl3akaNCErBJg== X-Gm-Gg: ASbGncvxSEYNjjyIQi0ujSlmyKx2p2XH4DZaFgPAWCAsu42qNujo91NltAdDEXwDssu DRxs+NLLAI9ilk01d2zeS2EuNYyD0Oa37oqak1biAFpdjkMZ6cKyjm/moGhyQWVslLHdh7BC2pE Dn0UkpYXdfCkoL/Al23bipvJ5eVDyMefyH9JTjYuS+/tzzwMtVDpLeMG+P5HmHIvi0sB61bK8wU 4llvnEfya7Vzj8uLEhWP9hSLzT4l08h9exkngFRpzulsyuEfzvF2u/m4GNwRQy1uEoe8ljdfI/Z UtE38PVvsCkiqoKdC4AvMYhKxLB8m3cmqcA4cZcKvUfJzC3jPI/aUUJ/3BlKutCJMuRgA9D6HPD ORKIVMSLB3IKJ3zS3Huuk8wmBYEMaqPttgRcq X-Google-Smtp-Source: AGHT+IGuo9eAuj3/ZulUgVYVuEINR6TV4aJnWcXikBTGTDNlZ8YqpVl3rERmqVeHdcMBB1locGc5IA== X-Received: by 2002:a05:6512:2242:b0:553:3892:5ec3 with SMTP id 2adb3069b0e04-55366c354f4mr16249e87.46.1749145985864; Thu, 05 Jun 2025 10:53:05 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:05 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:52:59 +0000 Subject: [PATCH v2 06/12] dt-bindings: usb: usb-device: Add orientation and rotation Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-6-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 For some devices, such as cameras, the OS needs to know where they are mounted. ACPI has a property for this purpose, which is parsed by acpi_get_physical_device_location(): https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/06_Device_Configuration/Device_Configuration.html#pld-physical-location-of-device In DT we have similar properties for video-interface-devices called orientation and rotation: Documentation/devicetree/bindings/media/video-interface-devices.yaml Add rotation and orientation for usb-devices that matches the already existing properties of video-interface-devices. Signed-off-by: Ricardo Ribalda --- Documentation/devicetree/bindings/usb/usb-device.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/usb-device.yaml b/Documentation/devicetree/bindings/usb/usb-device.yaml index c676956810331b81f11f3624340fc3e612c98315..a44eb24c657993f88145377a4706ec419b6cd998 100644 --- a/Documentation/devicetree/bindings/usb/usb-device.yaml +++ b/Documentation/devicetree/bindings/usb/usb-device.yaml @@ -44,6 +44,14 @@ properties: - minimum: 1 maximum: 255 + orientation: + description: If present, specifies the orientation of the usb device. + $ref: /schemas/media/video-interface-devices.yaml#/properties/orientation + + rotation: + description: If present, specifies the rotation of the usb device. + $ref: /schemas/media/video-interface-devices.yaml#/properties/rotation + "#address-cells": description: should be 1 for hub nodes with device nodes, should be 2 for device nodes with interface nodes. @@ -103,6 +111,8 @@ examples: device@2 { compatible = "usb123,4567"; reg = <2>; + orientation = <0>; + rotation = <90>; }; device@3 { From patchwork Thu Jun 5 17:53:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 894208 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 CCC7827AC24 for ; Thu, 5 Jun 2025 17:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145991; cv=none; b=dKpC1PesM+vd0arryhLazEdHjdjaAAbcRaGvYCSr1HZ9e2wnq5v9S8F3LnGwRvegUmr6CshxhXgAVqcHS7p/ipNgbAjS49+mFqEAZqfdtdltE+qTJ0xYnBl0PKjRutQRKgeJByi2WknIsjDlCnAwcOVHZDNZjJHeva5rsXdKbno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145991; c=relaxed/simple; bh=1ZgSjQTaGaaFH/a8mMoBM5PvRpGKxv9Y52j0p6HXpHM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VbSMYeb12SsEtxHZM8zW7hu4tOlbQFijcIWaENIyxUElg2z5I3P8t0kfuwszF9lmKPXpk4ama+YKK8Bos5AWRG5s/aRzdcw0rxos2te+H4bexbxY4E3PwC0aeWAbBVO4VjagN+jkB8Fk+jh40Xm05T0RahN1Gcv/6ZZsvHxJZzc= 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=aCh43tO+; arc=none smtp.client-ip=209.85.167.42 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="aCh43tO+" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5532a30ac41so1417583e87.0 for ; Thu, 05 Jun 2025 10:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145986; x=1749750786; 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=ITiETVL4DPlwiitJN8fQTR1CuO5aBFmT5UfjWJScKqs=; b=aCh43tO+ZuTamS1hd+2y1nDBrpy0Zw3gcRNZy0qbqIUkvLlXaM5nfyQiodfAYNqr22 ALAg9iirpfeN+hRSB8RsY0joZc6hYDKzTp7kCqVEDJyAihjnnLhY0WJX/3v4VOPVdnfp gqoxtNoQqZ04fbfzYd5uWUCiyXGM1IQGS1n0o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145986; x=1749750786; 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=ITiETVL4DPlwiitJN8fQTR1CuO5aBFmT5UfjWJScKqs=; b=UxygYC4paPL67xueClX1NNYtBw15vUFJ0fK5t2kNPrtLo84xSTDmRyOWUkYRXbQJC5 P9wlOhnVa9dx21tfjYQz/WVq+q97YUvMzvS43Mw5e4ffFWb4hns0Tw2rvoliEqqj7FLI JCLDsxVBcaqIiQSo5lARYim3fkzv6PvuxqFDmn8G5Mhq9vfb8Yqx7D/a9SWILBC5pMIS emdvVnthfOr51xyOwIlNXTrlzKQDC5QVxcApAOngdw7/OwTLgS/Khl8w60j0FHCMxqte FZgmi5GsghCOi+N2Y11iqXBS4yG9ZicHbQrb29IoaUH3IFTl+4c48li1oRdtoxd6O+Ge r1+Q== X-Forwarded-Encrypted: i=1; AJvYcCUVlnwZtEDURMUkHNqn0b5pZK74F78oJcw37AvKF5EnxG+ds5RgMD4u5PRuTZmGCqk9kiXrxGqOWx/M@vger.kernel.org X-Gm-Message-State: AOJu0Yy68HDowYAcnHBxPXlq0wqsqPC0wM0HxXbPUJNkVit/Mv3av69+ mZkMw9iTX+fVitFgIjgJbb7+c36AhRGe496o1t+kVcGeZGQ1U8Om+fEhPCojtY3kjA== X-Gm-Gg: ASbGnct6OfrbII49fJDHQnukJRhHvUFBnkrokgxuOWtzbLi+HjrmnlOja0fSDQJPOOG hs5Vp/KGlxp8AEP8s2/eG62mWzvaoDVCrs4+AH58qByWZvZI9MzQRdasuNm+xKZiIJYkpaqxvjE 9E2ZuOQkay1vVPGR6FrMvckDT8STmuWQSjIPsJR3jl/9mq9ijqHvqjrSVpIYayu/YeuuXZvh9MP fodOrr0a0cI9fOodkZN7ciEsd2ruBXaxxSiX9XXHVansNVVv02QKWidvYQwk/GRX86pAfFP4mvK PX10cY5VDgsBWRM4ukHcSfPJI5F//pfrpBcCb82/JJNwyth2jvAxaQ9c9brd+4MUIlo0rPGAM+E dAGoNQjuwLXCEvzHR5yqmiYKDDw== X-Google-Smtp-Source: AGHT+IF1UcMtPah0m8jT6Ln6JdgWvGYN1lsGuqlL6zma9QAAKsKScIhOqpWLrtFSd+pn1Q20FL2yNg== X-Received: by 2002:a05:6512:10d4:b0:553:2e4a:bb58 with SMTP id 2adb3069b0e04-55366bdcb99mr25796e87.9.1749145986344; Thu, 05 Jun 2025 10:53:06 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:06 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:53:00 +0000 Subject: [PATCH v2 07/12] media: uvcvideo: Make uvc_alloc_entity non static Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-7-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 The function is useful for other compilation units. This is just a refactor patch, no new functionality is added. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 4 ++-- drivers/media/usb/uvc/uvcvideo.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index da24a655ab68cc0957762f2b67387677c22224d1..bcc97f71fa1703aea1119469fb32659c17d9409a 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -792,8 +792,8 @@ static const u8 uvc_media_transport_input_guid[16] = UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT; static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING; -static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, - unsigned int num_pads, unsigned int extra_size) +struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pads, + unsigned int extra_size) { struct uvc_entity *entity; unsigned int num_inputs; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index b9f8eb62ba1d82ea7788cf6c10cc838a429dbc9e..dc23d8a97340dc4615d4182232d395106e6d9ed5 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -684,6 +684,8 @@ do { \ */ struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id); +struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pads, + unsigned int extra_size); /* Video buffers queue management. */ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type); From patchwork Thu Jun 5 17:53:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 895236 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 7545E279780 for ; Thu, 5 Jun 2025 17:53:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; cv=none; b=WV/TLDpmzhojSwJ8/mnMCedcSdAEn9i1o6gkzuq2C7dLyJT3JFFCeFSliBMwcB+fngQ9+3zz+bntSULvP6bFza1B12jUlfMb+uujBMawC1FWCv50RWyX6jdUBg1d3UHp4s5GN0JJyHbrCkp2L0BFuIfQqT6ow6lWMllVK4m410M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; c=relaxed/simple; bh=PckKnFSxOg9GYZ2RgDdQ7TbT8exqy29AY7cJP+o5vh8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CLQbl3nZVPEjrHI1YYoeEojowUX8uVaRX+danNWyueZ9GO1yp+tYOe2v8epfa5GpCAX/2ZGA95kqbApye8Ice34lIxnLJQfdFUBoayG6nWdSOfpyx7l2GAdQKnPNQss7yqbK3owkWSv59WOxJw6UxUJsIrb2KEL+KNLoeG0RcK0= 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=AXZKedNF; arc=none smtp.client-ip=209.85.167.51 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="AXZKedNF" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-54c0fa6d455so1344623e87.1 for ; Thu, 05 Jun 2025 10:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145987; x=1749750787; 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=j6tUr6JaXE+CWPBqDdD3JjkYCAuszK1ZF5ibIukQa9c=; b=AXZKedNF/G3j/7ahIQ3xMkuJHynm3huVck4ebXW2msBXnWHZ4y6l5Z4Q6jX5MBCD5w JMhm0d1C2F3mOOY5JC7R7OklPZY/zSa/oRO7AudWwFW5pDBZDGucJIk8c+V+Lxtc/itz iX4Qftq/xbpEErzOlFl3CllZsBCuL1DN1Hacw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145987; x=1749750787; 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=j6tUr6JaXE+CWPBqDdD3JjkYCAuszK1ZF5ibIukQa9c=; b=bMb5W78i/HYKUWs1j7xl/U+4aRa8Of4s/H4fL77SpZH0HL5BeDe99oHXx4L6kfjHrt fuB8Q7TEw7Pnhf8NL/CxB+cG0Z5JJ+7wLpSApQvTPzZmUR47C9Xvzbv/eB+klTyhSidS Tqf4bQ33Cz54I1bu29cT9Huuo9JdWVRQ2DBAioO3XlqY0W0l+WE88suUfX9S4MD9jV8W Zp+gLEUiqWy58TSBbegivAWY6r+s1zDGz7fsjKwFvAdc26pGKkc+uPkz3Rb2OtGw4/zs r3MhNv0VVMBClarONt+GrIaXLc7I2neRUF/KpOGpUFjVFFgKkC1kIWBROeIjUFIWu6EN 6Q1g== X-Forwarded-Encrypted: i=1; AJvYcCXgxd7Pg5H70Upjb/8HKez5H/Gslz2ekv054ySOG90lS6NXXdt/TCn5Gvyc8I/2AmPq1agjS2z9OWfF@vger.kernel.org X-Gm-Message-State: AOJu0YzbuXxG+5lI7V/FrDDbmHSFCf5+CAgB+LmHuwMLojToNZejdc9d hNCznE7VozisloT/lzFyn5A9i5L5flEEoRDhg9yigojDC/X96tj2Q6zTLkRW1itPPA== X-Gm-Gg: ASbGncuh4MBXxpIwhFw5VkwS9MtA8SqvvxZgBX/OPn/e1eRY3Xb+URSo5rJhCwiiQCR kNJvBK38ZF7u2fiLxacktTIjBqaJXOiW74GllUOTYaYvbs6YjfyTTF74AinkIeHVD3h5KVfSfra 2JBjrH5t48w3kle71HbHhqsgu4CsypBz9SI8fbvIvGMoptQmWYzG+tgQu+ii+NmT3g6+FjlswPE C3UzRc69ZawRyREJdfVrVsewRUcdrYowt+DOjFgXx7tFDUfT6ufow/swzyjDwLFXJwT/nZZ9+V4 QoTBjTlov+sz1uKU/TbUc0SFhQW0LsvWjzxQajATfJjpM+dQe+JEDP14lBP+6AeBKI9ZIBR89Yv mYrFXbr7qbYZf0JvYr8Uhxpq0dA== X-Google-Smtp-Source: AGHT+IE78QhzN066PWs7vNhzkflF4XTGNMukn6K/7Yeg2fkW1EQLVSK/ScBTu0hitshAPAesP+ysdA== X-Received: by 2002:a05:6512:31d0:b0:553:23c4:6825 with SMTP id 2adb3069b0e04-55366bf07a4mr19063e87.19.1749145986843; Thu, 05 Jun 2025 10:53:06 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:06 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:53:01 +0000 Subject: [PATCH v2 08/12] media: uvcvideo: Add support for V4L2_CID_CAMERA_ORIENTATION Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-8-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 Fetch the orientation from the fwnode and map it into a control. The uvc driver does not use the media controller, so we need to create a virtual entity, like we previously did with the external gpio. We do not re-purpose the external gpio entity because its is planned to remove it. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/Makefile | 3 +- drivers/media/usb/uvc/uvc_ctrl.c | 21 +++++++++++ drivers/media/usb/uvc/uvc_driver.c | 14 +++++-- drivers/media/usb/uvc/uvc_entity.c | 1 + drivers/media/usb/uvc/uvc_swentity.c | 73 ++++++++++++++++++++++++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 14 +++++++ include/linux/usb/uvc.h | 3 ++ 7 files changed, 125 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile index 4f9eee4f81ab6436a8b90324a688a149b2c3bcd1..b4398177c4bb0a9bd49dfd4ca7f2e933b4a1d7df 100644 --- a/drivers/media/usb/uvc/Makefile +++ b/drivers/media/usb/uvc/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ - uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o + uvc_status.o uvc_isight.o uvc_debugfs.o uvc_metadata.o \ + uvc_swentity.o ifeq ($(CONFIG_MEDIA_CONTROLLER),y) uvcvideo-objs += uvc_entity.o endif diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 47e8ccc39234d1769384b55539a21df07f3d57c7..b2768080c08aafa85acb9b7f318672c043d84e55 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -376,6 +376,13 @@ static const struct uvc_control_info uvc_ctrls[] = { | UVC_CTRL_FLAG_GET_DEF | UVC_CTRL_FLAG_AUTO_UPDATE, }, + { + .entity = UVC_GUID_SWENTITY, + .selector = 0, + .index = 0, + .size = 1, + .flags = UVC_CTRL_FLAG_GET_CUR, + }, }; static const u32 uvc_control_classes[] = { @@ -975,6 +982,17 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .data_type = UVC_CTRL_DATA_TYPE_BITMASK, .name = "Region of Interest Auto Ctrls", }, + { + .id = V4L2_CID_CAMERA_ORIENTATION, + .entity = UVC_GUID_SWENTITY, + .selector = 0, + .size = 8, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_MENU, + .data_type = UVC_CTRL_DATA_TYPE_ENUM, + .menu_mask = GENMASK(V4L2_CAMERA_ORIENTATION_EXTERNAL, + V4L2_CAMERA_ORIENTATION_FRONT), + }, }; /* ------------------------------------------------------------------------ @@ -3210,6 +3228,9 @@ static int uvc_ctrl_init_chain(struct uvc_video_chain *chain) } else if (UVC_ENTITY_TYPE(entity) == UVC_EXT_GPIO_UNIT) { bmControls = entity->gpio.bmControls; bControlSize = entity->gpio.bControlSize; + } else if (UVC_ENTITY_TYPE(entity) == UVC_SWENTITY_UNIT) { + bmControls = entity->swentity.bmControls; + bControlSize = entity->swentity.bControlSize; } /* Remove bogus/blacklisted controls */ diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index bcc97f71fa1703aea1119469fb32659c17d9409a..96eeb3aee546487d15f3c30dfe1775189ddf7e47 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1869,11 +1869,15 @@ static int uvc_scan_device(struct uvc_device *dev) return -1; } - /* Add GPIO entity to the first chain. */ - if (dev->gpio_unit) { + /* Add virtual entities to the first chain. */ + if (dev->gpio_unit || dev->swentity_unit) { chain = list_first_entry(&dev->chains, struct uvc_video_chain, list); - list_add_tail(&dev->gpio_unit->chain, &chain->entities); + if (dev->gpio_unit) + list_add_tail(&dev->gpio_unit->chain, &chain->entities); + if (dev->swentity_unit) + list_add_tail(&dev->swentity_unit->chain, + &chain->entities); } return 0; @@ -2249,6 +2253,10 @@ static int uvc_probe(struct usb_interface *intf, if (ret < 0) goto error; + ret = uvc_swentity_init(dev); + if (ret < 0) + goto error; + dev_info(&dev->udev->dev, "Found UVC %u.%02x device %s (%04x:%04x)\n", dev->uvc_version >> 8, dev->uvc_version & 0xff, udev->product ? udev->product : "", diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c index cc68dd24eb42dce5b2846ca52a8dfa499c8aed96..d1a652ef35ec34801bd39a5124b834edf838a79e 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c @@ -106,6 +106,7 @@ static int uvc_mc_init_entity(struct uvc_video_chain *chain, case UVC_OTT_MEDIA_TRANSPORT_OUTPUT: case UVC_EXTERNAL_VENDOR_SPECIFIC: case UVC_EXT_GPIO_UNIT: + case UVC_SWENTITY_UNIT: default: function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; break; diff --git a/drivers/media/usb/uvc/uvc_swentity.c b/drivers/media/usb/uvc/uvc_swentity.c new file mode 100644 index 0000000000000000000000000000000000000000..702a2c26e029a0655dade177ed2a9b88d7a4136d --- /dev/null +++ b/drivers/media/usb/uvc/uvc_swentity.c @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * uvc_swentity.c -- USB Video Class driver + * + * Copyright 2025 Google LLC + */ + +#include +#include +#include +#include "uvcvideo.h" + +static int uvc_swentity_get_cur(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *data, u16 size) +{ + if (size < 1) + return -EINVAL; + + switch (entity->swentity.props.orientation) { + case V4L2_FWNODE_ORIENTATION_FRONT: + *(u8 *)data = V4L2_CAMERA_ORIENTATION_FRONT; + break; + case V4L2_FWNODE_ORIENTATION_BACK: + *(u8 *)data = V4L2_CAMERA_ORIENTATION_BACK; + break; + default: + *(u8 *)data = V4L2_CAMERA_ORIENTATION_EXTERNAL; + } + + return 0; +} + +static int uvc_swentity_get_info(struct uvc_device *dev, + struct uvc_entity *entity, u8 cs, u8 *caps) +{ + *caps = UVC_CONTROL_CAP_GET; + return 0; +} + +int uvc_swentity_init(struct uvc_device *dev) +{ + static const u8 uvc_swentity_guid[] = UVC_GUID_SWENTITY; + struct v4l2_fwnode_device_properties props; + struct uvc_entity *unit; + int ret; + + ret = v4l2_fwnode_device_parse(&dev->udev->dev, &props); + if (ret) + return dev_err_probe(&dev->intf->dev, ret, + "Can't parse fwnode\n"); + + if (props.orientation == V4L2_FWNODE_PROPERTY_UNSET) + return 0; + + unit = uvc_alloc_entity(UVC_SWENTITY_UNIT, UVC_SWENTITY_UNIT_ID, 0, 1); + if (!unit) + return -ENOMEM; + + memcpy(unit->guid, uvc_swentity_guid, sizeof(unit->guid)); + unit->swentity.props = props; + unit->swentity.bControlSize = 1; + unit->swentity.bmControls = (u8 *)unit + sizeof(*unit); + unit->swentity.bmControls[0] = 1; + unit->get_cur = uvc_swentity_get_cur; + unit->get_info = uvc_swentity_get_info; + strscpy(unit->name, "SWENTITY", sizeof(unit->name)); + + list_add_tail(&unit->list, &dev->entities); + + dev->swentity_unit = unit; + + return 0; +} diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index dc23d8a97340dc4615d4182232d395106e6d9ed5..a931750bdea25b9062dcc7644bf5f2ed89c1cb4c 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -19,6 +19,7 @@ #include #include #include +#include /* -------------------------------------------------------------------------- * UVC constants @@ -41,6 +42,9 @@ #define UVC_EXT_GPIO_UNIT 0x7ffe #define UVC_EXT_GPIO_UNIT_ID 0x100 +#define UVC_SWENTITY_UNIT 0x7ffd +#define UVC_SWENTITY_UNIT_ID 0x101 + /* ------------------------------------------------------------------------ * Driver specific constants. */ @@ -242,6 +246,12 @@ struct uvc_entity { int irq; bool initialized; } gpio; + + struct { + u8 bControlSize; + u8 *bmControls; + struct v4l2_fwnode_device_properties props; + } swentity; }; u8 bNrInPins; @@ -617,6 +627,7 @@ struct uvc_device { } async_ctrl; struct uvc_entity *gpio_unit; + struct uvc_entity *swentity_unit; }; enum uvc_handle_state { @@ -836,4 +847,7 @@ void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream); size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf, size_t size); +/* swentity */ +int uvc_swentity_init(struct uvc_device *dev); + #endif diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h index bce95153e5a65613a710d7316fc17cf5462b5bce..88a23e8919d1294da4308e0e3ca0eccdc66a318f 100644 --- a/include/linux/usb/uvc.h +++ b/include/linux/usb/uvc.h @@ -29,6 +29,9 @@ #define UVC_GUID_EXT_GPIO_CONTROLLER \ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03} +#define UVC_GUID_SWENTITY \ + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04} #define UVC_GUID_FORMAT_MJPEG \ { 'M', 'J', 'P', 'G', 0x00, 0x00, 0x10, 0x00, \ From patchwork Thu Jun 5 17:53:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 894207 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 8048C27BF7E for ; Thu, 5 Jun 2025 17:53:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; cv=none; b=oewXRCzKk1pLKfe6iS0omwv658Rj45BYn1ZFrWGxJLEyo2ufH7j31bKDE0UBKC7j2aQBpS90pWm1dx2DuaoxN2Q/NNC226SAdXqGeEx8cl7LbpdWEaUs3F0mIurMvbrIdjK7huTXL1J2wAL9pmGtwidW9CniNSvFChb363D2H88= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; c=relaxed/simple; bh=egMOMDJhHu8VwnbxMN9Mymsv63L3oycTPM3I/mDsNRQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=giST4f2IZDA4cdMS9kCf2mQL9RY0I/zZYe8HN0pYQNBZ3eS/f4b++Z+71vLp2M3xO5563U8TnDkq5AZ3qSaR9cvBaxKgZBFrZh3lU8yBTvRQTLBl+pgicVuVai73xMskNb7GYRcnG1KhQn5Tz6W5EXGXBvTPok4e3gn/8glHeaY= 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=UHkseJYV; arc=none smtp.client-ip=209.85.167.51 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="UHkseJYV" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-54e7967cf67so1434677e87.0 for ; Thu, 05 Jun 2025 10:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145988; x=1749750788; 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=UY1nemN8kbEMaW5aIDSm45n0IYZoWUHM/pKH/2rX0uY=; b=UHkseJYVy0u4EXsL85LuqmIPeTdak5S6hH4bKS9NqW45rauBziI1Q7eqUM+LWi/cUP zZxt3wnmQG9ZUGAKjoDPl7+/b2PSH4y3wxMcAF9o8/V6aidM8oktpvDWRvgQ0ojYF1je dCcgRcaK4tQ4We6Ob8hRi9kFe2LG3fBkdoyZA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145988; x=1749750788; 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=UY1nemN8kbEMaW5aIDSm45n0IYZoWUHM/pKH/2rX0uY=; b=suvmZy2ZU32y5R6rr8m6gv6LNG4ZXPz8vLpE/4e9+xJvZCSKsrUa23OqnF7CN0MdmZ GRjGQTgvRx54SijcnuyKmjN5k1uZ7ykw6ebgbJVTbgcg4o4D3C71VK+6D5zviIWJPkui Z9IqoYDPu/ruowxTLKtJhZ0/VzzVQVZdMjTOG6Sw+8q+Cg9QiJFuXNuxGqgvfT9M/7Ty nEh8AJVcf88jWiw+sGKPVjLABt7RBC5/brlM5c7b8JQKRIr2mkOdEp5S9jGTBvFs/5nV e4u6TQA6epe9vvCyTw9p/epj5PFC4JWpixLkIEh2Fm9U6SBrPD7ueGCa0c0BcrdkwAxk EfIQ== X-Forwarded-Encrypted: i=1; AJvYcCVayPR+CBrB2l5773WwDyHqkAuw6YsdAyysdq0sfbzaHqstsallvggiym2M4W36Dxidw9L8Wgf8v/DL@vger.kernel.org X-Gm-Message-State: AOJu0YzQgZmDxpZSD7Vub4EwH/cz3MTLHbd3OFyU6dmcN7KA7gYvUHlt mwRqsMJfAORH/qxkFSDf2KdxPZhrB2j8AQIRSYlV7LlVSactxUR5mASfhAAa7Z+hjg== X-Gm-Gg: ASbGncv6j7i1ytWXJ9Ty/TtUMp7Bsr/DslELMhJMKjpL44msxgozsi/q6CfPDOUCbmi i2L6nKcIfoonJNMuZG2GraIgf4m78FZ3LkEdjr3IW29n1CrSuGKBCs3v1EF36yD8E2F6tlcun68 k6MCVz6mh7fO1gAgR6bCQ8kSTRi5H5h8B1uGl44o1/KiMKmzO9298KIiFMV8axTkksYiAbKYvyw rMZp2a21QHOv70yamFkOIzKaRBvHE2XDpGQd3XhObxtjg+BNn/edRpQck5TJ58zNuNc+7Vfgl1x ssxmF9lloZdd4gIO9svpVr8ZDsjRVRiWwp9Nbcgl71XQzFhvFs5VOLSp9nSXwXJwygRP9gKXL5/ EguKVM3ujiNFL+fyhZl4TjTETdQ== X-Google-Smtp-Source: AGHT+IEnD7AFEZckYuKmwsfHwGsLYjywTkpmWOaoTd6kF/ELxj955HQ/ZSBaFJSZRs3aRwI14ePC2g== X-Received: by 2002:a05:6512:10d5:b0:553:25f4:695a with SMTP id 2adb3069b0e04-55366bdf719mr23052e87.22.1749145987747; Thu, 05 Jun 2025 10:53:07 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:07 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:53:02 +0000 Subject: [PATCH v2 09/12] media: uvcvideo: Add uvc_ctrl_query_entity helper Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-9-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 Create a helper function to query a control. The new function reduces the number of arguments, calculates the length of the operation and redirects the operation to the hardware or to the entity private functions. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 81 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index b2768080c08aafa85acb9b7f318672c043d84e55..21ec7b978bc7aca21db7cb8fd5d135d876f3330c 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -576,6 +576,34 @@ static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc15 = { V4L2_CID_POWER_LINE_FREQUENCY_DISABLED), }; +static int uvc_ctrl_query_entity(struct uvc_device *dev, + const struct uvc_control *ctrl, u8 query, + void *data) +{ + u16 len; + + switch (query) { + case UVC_GET_INFO: + len = 1; + break; + case UVC_GET_LEN: + len = 2; + break; + default: + len = ctrl->info.size; + } + + if (query == UVC_GET_CUR && ctrl->entity->get_cur) + return ctrl->entity->get_cur(dev, ctrl->entity, + ctrl->info.selector, data, len); + if (query == UVC_GET_INFO && ctrl->entity->get_info) + return ctrl->entity->get_info(dev, ctrl->entity, + ctrl->info.selector, data); + + return uvc_query_ctrl(dev, query, ctrl->entity->id, dev->intfnum, + ctrl->info.selector, data, len); +} + static const struct uvc_control_mapping *uvc_ctrl_filter_plf_mapping( struct uvc_video_chain *chain, struct uvc_control *ctrl) { @@ -1222,35 +1250,27 @@ static int uvc_ctrl_populate_cache(struct uvc_video_chain *chain, int ret; if (ctrl->info.flags & UVC_CTRL_FLAG_GET_DEF) { - ret = uvc_query_ctrl(chain->dev, UVC_GET_DEF, ctrl->entity->id, - chain->dev->intfnum, ctrl->info.selector, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_DEF), - ctrl->info.size); + ret = uvc_ctrl_query_entity(chain->dev, ctrl, UVC_GET_DEF, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_DEF)); if (ret < 0) return ret; } if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MIN) { - ret = uvc_query_ctrl(chain->dev, UVC_GET_MIN, ctrl->entity->id, - chain->dev->intfnum, ctrl->info.selector, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MIN), - ctrl->info.size); + ret = uvc_ctrl_query_entity(chain->dev, ctrl, UVC_GET_MIN, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MIN)); if (ret < 0) return ret; } if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MAX) { - ret = uvc_query_ctrl(chain->dev, UVC_GET_MAX, ctrl->entity->id, - chain->dev->intfnum, ctrl->info.selector, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX), - ctrl->info.size); + ret = uvc_ctrl_query_entity(chain->dev, ctrl, UVC_GET_MAX, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); if (ret < 0) return ret; } if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) { - ret = uvc_query_ctrl(chain->dev, UVC_GET_RES, ctrl->entity->id, - chain->dev->intfnum, ctrl->info.selector, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES), - ctrl->info.size); + ret = uvc_ctrl_query_entity(chain->dev, ctrl, UVC_GET_RES, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); if (ret < 0) { if (UVC_ENTITY_TYPE(ctrl->entity) != UVC_VC_EXTENSION_UNIT) @@ -1291,16 +1311,7 @@ static int __uvc_ctrl_load_cur(struct uvc_video_chain *chain, return 0; } - if (ctrl->entity->get_cur) - ret = ctrl->entity->get_cur(chain->dev, ctrl->entity, - ctrl->info.selector, data, - ctrl->info.size); - else - ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, - ctrl->entity->id, chain->dev->intfnum, - ctrl->info.selector, data, - ctrl->info.size); - + ret = uvc_ctrl_query_entity(chain->dev, ctrl, UVC_GET_CUR, data); if (ret < 0) return ret; @@ -2164,11 +2175,8 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, continue; if (!rollback) - ret = uvc_query_ctrl(dev, UVC_SET_CUR, ctrl->entity->id, - dev->intfnum, ctrl->info.selector, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), - ctrl->info.size); - + ret = uvc_ctrl_query_entity(dev, ctrl, UVC_SET_CUR, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); if (!ret) processed_ctrls++; @@ -2570,13 +2578,7 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev, if (data == NULL) return -ENOMEM; - if (ctrl->entity->get_info) - ret = ctrl->entity->get_info(dev, ctrl->entity, - ctrl->info.selector, data); - else - ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id, - dev->intfnum, info->selector, data, 1); - + ret = uvc_ctrl_query_entity(dev, ctrl, UVC_GET_INFO, data); if (!ret) { info->flags &= ~(UVC_CTRL_FLAG_GET_CUR | UVC_CTRL_FLAG_SET_CUR | @@ -2654,8 +2656,7 @@ static int uvc_ctrl_fill_xu_info(struct uvc_device *dev, info->selector = ctrl->index + 1; /* Query and verify the control length (GET_LEN) */ - ret = uvc_query_ctrl(dev, UVC_GET_LEN, ctrl->entity->id, dev->intfnum, - info->selector, data, 2); + ret = uvc_ctrl_query_entity(dev, ctrl, UVC_GET_LEN, data); if (ret < 0) { uvc_dbg(dev, CONTROL, "GET_LEN failed on control %pUl/%u (%d)\n", From patchwork Thu Jun 5 17:53:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 895237 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 BB0B127C14E for ; Thu, 5 Jun 2025 17:53:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145994; cv=none; b=F1mT3svZ91pKmSAMnJCKo8qdLy2gf1jcJHicZZkT5C2gb+oCuWhoMWRTeBYIYnArz60LubQeF0BGx/zpQ9n5/o+zYKqM0ZtFQ5pHdxYAAlzdCSiT4kbENH85R1VAPIQ4nc8/m88YZjyG9HA6KNvkaPbNSMfHkL/pSKXLkeJ7pNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145994; c=relaxed/simple; bh=R4NuKjk4LUn+NcJI1dWp1KbkF6gjPs2+DtnjDwx4z/w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cwWVdiFAgtoyJNWwq3WI47ArnqgCdy8ji9XILVbpEVVmBThZ0VlVB38Lfj/ZlNLMsUGe0UupowrwAekoXXqHKdjHZxJAOqcQMjoGmqurVD5balCZ3onJ9tPFlHhxkVAvLZT9kQZEgdNOcLtM958uaIj4KShzqVVsFzCYHv9IdAA= 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=V+0C9v+d; arc=none smtp.client-ip=209.85.167.46 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="V+0C9v+d" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5535e35b059so1205512e87.1 for ; Thu, 05 Jun 2025 10:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145988; x=1749750788; 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=IKykJ86GJEjKAZ51EtUiBvhJS0VRnpbfEH3e5dzBR4w=; b=V+0C9v+d+sPzo+NIIu+xX4SgvhbNXZT1rIU/lO+otk7ArMDYMkCKVfP/HyVr7Gv7g2 XgyTjdgtyNzyK8o98HyCCx7QsCFysvih4WgTvrcoVgdg2gXBC6HxPmrIL7x35V4oByyB Zw5erXMKN13T3/kcFHyctTALxIvFQWaJtsGdU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145988; x=1749750788; 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=IKykJ86GJEjKAZ51EtUiBvhJS0VRnpbfEH3e5dzBR4w=; b=PmSFvc38AICWzS3PUa+IAco/Gft9osSYH1yvG40LlOo8/gZQ2H2Dt8qQ9U3xRd18Qx qsjQY/ex39cLNXCpXwAWdLs7fjEoKAgjtpDRkDN+C5TtJ0bJDGU2F+NW44rUuprLq+/Q lSp+4zXYiYGAxuzH/mUez7K+HJQFG/gOIWwlf/SOimfvOrU47ElIPvhu6WaBzDDOPxLA RdJH7LZ9MU5ioONeCKW/KE1yW9tA/3XJXWFddADqs/MumaNUo6ebt3Y1jcSWInSW7OSa 9l8EerbmluRU4wv71vmD/S/TBa1ezm4uQx/Oxs1XzJvXwllHEhWpgnSMQMk1TIGW9ax/ UGCQ== X-Forwarded-Encrypted: i=1; AJvYcCUUgHZUTwpcCLobe1XrsUij5lRiNtmbDxvg2CWcwDubGeDejYjyreTBKH+iqIJ6BHxcxO3buTn3Ak31@vger.kernel.org X-Gm-Message-State: AOJu0YykfdLQKkQk44IfLFErP2yFKPhNyIlpUdI5PpPaFH0E2zFpt+yY xZm/bM0X6FZ541iYrpS3em4pvh9d/w9twIXmdjlxCw2mQ+bX0g6TK3u1EMWbrAxCqg== X-Gm-Gg: ASbGncubT5l7yZXBZjsGz5ZOmt93EGb2xHBxnVmmI48S/7AF9YoG1OMc6WNXCySHYIN o03UcNRhWz9drgnjUAWn2ohJXG6kRjmuDJE7JuwKFKdqKIvdH3cQGYP65OAeUbm5V/9dOmdegUY aFz1o6ZHYasNbc2eSK2iW4bIhNQc4KvsYDHxqC5+P2cD/J/abk8GzhetmOqf24w3oXpBixkt4T+ 7fnjh5O4dlPWYrjYlfCXcXgk4EBXtNEGzMO9ruyzrm3BF7KBIunkNbQSPXe2jpry9S4EryapqnL eWiOZp0Ruvx4D7XgncoUMMhRiiypUqnZMO0WxgEyu6pYB74UG+S7dIYNX6xkYEWVkF7YyEaK5i1 bqFrUtkt+KlCIG1c2EwmqmjiOSw== X-Google-Smtp-Source: AGHT+IHp+xpg2FO63nkT7Lh5wy4seP/EyKn6xsYU+/2Jg59TJvy9YvZlmgC6AlIASMeTxBqC41J75A== X-Received: by 2002:a05:6512:239d:b0:553:35bb:f7ba with SMTP id 2adb3069b0e04-55366bf08b7mr21355e87.11.1749145988208; Thu, 05 Jun 2025 10:53:08 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:07 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:53:03 +0000 Subject: [PATCH v2 10/12] media: uvcvideo: Add get_* functions to uvc_entity Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-10-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 Virtual entities need to provide more values than get_cur and get_cur for their controls. Add support for get_def, get_min, get_max and get_res. This is a preparation patch. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 12 ++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 21ec7b978bc7aca21db7cb8fd5d135d876f3330c..59be62ae24a4219fa9d7aacf2ae7382c95362178 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -596,6 +596,18 @@ static int uvc_ctrl_query_entity(struct uvc_device *dev, if (query == UVC_GET_CUR && ctrl->entity->get_cur) return ctrl->entity->get_cur(dev, ctrl->entity, ctrl->info.selector, data, len); + if (query == UVC_GET_DEF && ctrl->entity->get_def) + return ctrl->entity->get_def(dev, ctrl->entity, + ctrl->info.selector, data, len); + if (query == UVC_GET_MIN && ctrl->entity->get_min) + return ctrl->entity->get_min(dev, ctrl->entity, + ctrl->info.selector, data, len); + if (query == UVC_GET_MAX && ctrl->entity->get_max) + return ctrl->entity->get_max(dev, ctrl->entity, + ctrl->info.selector, data, len); + if (query == UVC_GET_RES && ctrl->entity->get_res) + return ctrl->entity->get_res(dev, ctrl->entity, + ctrl->info.selector, data, len); if (query == UVC_GET_INFO && ctrl->entity->get_info) return ctrl->entity->get_info(dev, ctrl->entity, ctrl->info.selector, data); diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index a931750bdea25b9062dcc7644bf5f2ed89c1cb4c..d6da8ed3ad4cf3377df49923e051fe04d83d2e38 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -261,6 +261,14 @@ struct uvc_entity { u8 cs, u8 *caps); int (*get_cur)(struct uvc_device *dev, struct uvc_entity *entity, u8 cs, void *data, u16 size); + int (*get_def)(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *data, u16 size); + int (*get_min)(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *data, u16 size); + int (*get_max)(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *data, u16 size); + int (*get_res)(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *data, u16 size); unsigned int ncontrols; struct uvc_control *controls; From patchwork Thu Jun 5 17:53:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 894206 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 3F51027CB34 for ; Thu, 5 Jun 2025 17:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; cv=none; b=shlpS659U8rG0A0+dv1tEryPAIlTRZL8wKjnvaJTWXxsjEmTCt2AeiTRQeGKs2gIoD8rDb+OBWZDUwyL6oIRBhGT6JKOW1Bk2mTmxSibo2RaKWnTW419zhYtRzKfWKIZL0Y3lMKu1r3hl88BOP38xqspIjI9qufg5UNxpgvCSKo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; c=relaxed/simple; bh=7MKTDlXdmTzEBoZknQKsTqh+wgws17pHYpyBR/S4V4U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ra/3EQp3HRkQvy+DEV6RZaYWIOJfGBzVejtBgUaeRE48tyvmdo0pfBztx0XHW8DTB+zsfEaetN7lZ1n8sbdYD428qOHdib2c7CpQ5KOmkc+TBq60wgJHZej+IRgkD1RKq0cVU3s7BpkwZGKkaqmEwfZovEXgV3ng91lbi90tnsI= 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=Oywg+k5E; arc=none smtp.client-ip=209.85.167.53 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="Oywg+k5E" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5533303070cso1439667e87.2 for ; Thu, 05 Jun 2025 10:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145989; x=1749750789; 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=vl8ssGy20WIwQ9oJ9UugxpfMo+m1ppVl8PDiVTX1sSc=; b=Oywg+k5EBVEHy3LHmGFUNavNA7GwdFWc1vz6M5mpc/7YMcA0QBSVYfrhbclqESCxur J9IfISe7u56op8zhaCm0PCXm74qTf5+i1Htx3Fq+OkNAm2lfRqc3bb+4LfIrj+sR71pZ rRkgSmbWLLqlwYYhse4psHCe9ECJqMEuCj2j0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145989; x=1749750789; 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=vl8ssGy20WIwQ9oJ9UugxpfMo+m1ppVl8PDiVTX1sSc=; b=B91hIeCjI+PE7W7v/LyL4Hq5OsIsTZhRaO6rI4HOaapyNRbR10w31TtoR8Lux7zeYe Nc/ccKG5710HJDXcn8ClUEz9tMu6f710ut+P/Uxtv+4C7DGxmj3T15X8k+dpl/MpQ7Z8 Y12Acuu4AJ99AW/qnHB51gV6UfmlMPkQYMP5wS+lubcabwIND9ELWiweZ4tZbbhCyLYy SB4iYMqWCDCm1WrjPQOclQAC5926dJKkzPOg/gdY/CMWbdEwwbEVN6p7afSquzCotTnH XrxcRLGOmX+cGhG6JZHv2JA+AdA2CCz79ZeXkVtIJ9TD0+EYYy+BmNCYrMZ67kMtu5cm aEhQ== X-Forwarded-Encrypted: i=1; AJvYcCWpMYXvTr8+Whz3oWk9lXv8RAYFPJ/74ZblbcyQ1KQhcvOSwIRQnJz2lkXT8IZ0nPuxnKxLT5yRRl4m@vger.kernel.org X-Gm-Message-State: AOJu0YzgIdGbuPh521Hztn3r6+pJsRQwo4GzebKDBO9pKpCvwLXJ3ujG V38tzNduD3lgjEkphFgMEEoHVOj6jSI7Uo8eKLlW2TAzs1PbQbpRlV0yAk6N8+iYYg== X-Gm-Gg: ASbGncucrDaOsZ/qOzozGmFngezOsDCl606aFfAvUkumZ2dS4Jje4dVaRETZ7DftCPo /3xmSdbGOML+jpWncq93mUiCLqXGuttO9DEoEdZTBLg/zDC99gtdtdJ9O6RotZntRTZnW8nJnkJ rUiO7J8SqQuNLmwMKnOZvXfdpKOgqfMefcsDtjbuNHT4dRaBC52enYC2jQDQivl4yebgK4maEvF cwIgBQL0NIBmFlsgQVynBc/dXkYJwITyemWbJm+X24OZWKXEUvc3m0/wv4E88WTY53lHEKkn5v6 XPKKnkr9dbnAE3uOzBkoG2UNLc0KpOVD0Y83thRYC61OJTnyBVGxFoAnTK1WeIB3ytVLDN0HEkG 8zhb1q43HHgb0t9zk8Jdxw+X0tw== X-Google-Smtp-Source: AGHT+IFlq5ht3uZf7ciRLQmdAPYFGASf3iU3YYzwLzFJOAeEkyQ6j/O5YV23vNe1kOHNJm+t25D9ag== X-Received: by 2002:a05:6512:b94:b0:553:20f2:2e57 with SMTP id 2adb3069b0e04-55366be0c0emr26440e87.17.1749145988776; Thu, 05 Jun 2025 10:53:08 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:08 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:53:04 +0000 Subject: [PATCH v2 11/12] media: uvcvideo: Add support for V4L2_CID_CAMERA_ROTATION Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-11-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 Fetch the rotation from the fwnode and map it into a control. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 22 +++++++++++++-- drivers/media/usb/uvc/uvc_swentity.c | 55 ++++++++++++++++++++++++++++++++---- drivers/media/usb/uvc/uvcvideo.h | 5 ++++ 3 files changed, 74 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 59be62ae24a4219fa9d7aacf2ae7382c95362178..5788f0c0f6604da06a7bca1b9999d0957817e75e 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -378,11 +378,18 @@ static const struct uvc_control_info uvc_ctrls[] = { }, { .entity = UVC_GUID_SWENTITY, - .selector = 0, - .index = 0, + .selector = UVC_SWENTITY_ORIENTATION, + .index = UVC_SWENTITY_ORIENTATION, .size = 1, .flags = UVC_CTRL_FLAG_GET_CUR, }, + { + .entity = UVC_GUID_SWENTITY, + .selector = UVC_SWENTITY_ROTATION, + .index = UVC_SWENTITY_ROTATION, + .size = 2, + .flags = UVC_CTRL_FLAG_GET_RANGE, + }, }; static const u32 uvc_control_classes[] = { @@ -1025,7 +1032,7 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { { .id = V4L2_CID_CAMERA_ORIENTATION, .entity = UVC_GUID_SWENTITY, - .selector = 0, + .selector = UVC_SWENTITY_ORIENTATION, .size = 8, .offset = 0, .v4l2_type = V4L2_CTRL_TYPE_MENU, @@ -1033,6 +1040,15 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { .menu_mask = GENMASK(V4L2_CAMERA_ORIENTATION_EXTERNAL, V4L2_CAMERA_ORIENTATION_FRONT), }, + { + .id = V4L2_CID_CAMERA_SENSOR_ROTATION, + .entity = UVC_GUID_SWENTITY, + .selector = UVC_SWENTITY_ROTATION, + .size = 16, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_INTEGER, + .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, + }, }; /* ------------------------------------------------------------------------ diff --git a/drivers/media/usb/uvc/uvc_swentity.c b/drivers/media/usb/uvc/uvc_swentity.c index 702a2c26e029a0655dade177ed2a9b88d7a4136d..60f3166addbeb7d2e431d107b23034d2d11a1812 100644 --- a/drivers/media/usb/uvc/uvc_swentity.c +++ b/drivers/media/usb/uvc/uvc_swentity.c @@ -10,10 +10,11 @@ #include #include "uvcvideo.h" -static int uvc_swentity_get_cur(struct uvc_device *dev, struct uvc_entity *entity, - u8 cs, void *data, u16 size) +static int uvc_swentity_get_orientation(struct uvc_device *dev, + struct uvc_entity *entity, u8 cs, + void *data, u16 size) { - if (size < 1) + if (cs != UVC_SWENTITY_ORIENTATION || size != 1) return -EINVAL; switch (entity->swentity.props.orientation) { @@ -30,6 +31,31 @@ static int uvc_swentity_get_cur(struct uvc_device *dev, struct uvc_entity *entit return 0; } +static int uvc_swentity_get_rotation(struct uvc_device *dev, + struct uvc_entity *entity, u8 cs, void *data, + u16 size) +{ + if (cs != UVC_SWENTITY_ROTATION || size != 2) + return -EINVAL; + + ((u8 *)data)[0] = entity->swentity.props.rotation; + ((u8 *)data)[1] = entity->swentity.props.rotation >> 8; + + return 0; +} + +static int uvc_swentity_get_cur(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *data, u16 size) +{ + switch (cs) { + case UVC_SWENTITY_ORIENTATION: + return uvc_swentity_get_orientation(dev, entity, cs, data, size); + case UVC_SWENTITY_ROTATION: + return uvc_swentity_get_rotation(dev, entity, cs, data, size); + } + return -EINVAL; +} + static int uvc_swentity_get_info(struct uvc_device *dev, struct uvc_entity *entity, u8 cs, u8 *caps) { @@ -37,11 +63,22 @@ static int uvc_swentity_get_info(struct uvc_device *dev, return 0; } +static int uvc_swentity_get_res(struct uvc_device *dev, struct uvc_entity *entity, + u8 cs, void *res, u16 size) +{ + if (size == 0) + return -EINVAL; + ((u8 *)res)[0] = 1; + memset(res + 1, 0, size - 1); + return 0; +} + int uvc_swentity_init(struct uvc_device *dev) { static const u8 uvc_swentity_guid[] = UVC_GUID_SWENTITY; struct v4l2_fwnode_device_properties props; struct uvc_entity *unit; + u8 controls = 0; int ret; ret = v4l2_fwnode_device_parse(&dev->udev->dev, &props); @@ -49,7 +86,11 @@ int uvc_swentity_init(struct uvc_device *dev) return dev_err_probe(&dev->intf->dev, ret, "Can't parse fwnode\n"); - if (props.orientation == V4L2_FWNODE_PROPERTY_UNSET) + if (props.orientation != V4L2_FWNODE_PROPERTY_UNSET) + controls |= BIT(UVC_SWENTITY_ORIENTATION); + if (props.rotation != V4L2_FWNODE_PROPERTY_UNSET) + controls |= BIT(UVC_SWENTITY_ROTATION); + if (!controls) return 0; unit = uvc_alloc_entity(UVC_SWENTITY_UNIT, UVC_SWENTITY_UNIT_ID, 0, 1); @@ -60,9 +101,13 @@ int uvc_swentity_init(struct uvc_device *dev) unit->swentity.props = props; unit->swentity.bControlSize = 1; unit->swentity.bmControls = (u8 *)unit + sizeof(*unit); - unit->swentity.bmControls[0] = 1; + unit->swentity.bmControls[0] = controls; unit->get_cur = uvc_swentity_get_cur; unit->get_info = uvc_swentity_get_info; + unit->get_res = uvc_swentity_get_res; + unit->get_def = uvc_swentity_get_rotation; + unit->get_min = uvc_swentity_get_rotation; + unit->get_max = uvc_swentity_get_rotation; strscpy(unit->name, "SWENTITY", sizeof(unit->name)); list_add_tail(&unit->list, &dev->entities); diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index d6da8ed3ad4cf3377df49923e051fe04d83d2e38..7cca0dc75d11f6a13bc4f09676a5a00e80cb38f7 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -45,6 +45,11 @@ #define UVC_SWENTITY_UNIT 0x7ffd #define UVC_SWENTITY_UNIT_ID 0x101 +enum { + UVC_SWENTITY_ORIENTATION, + UVC_SWENTITY_ROTATION +}; + /* ------------------------------------------------------------------------ * Driver specific constants. */ From patchwork Thu Jun 5 17:53:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 895235 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 E45BA27CCCD for ; Thu, 5 Jun 2025 17:53:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; cv=none; b=QZn69BYmckqruQJIoRasHoQ8M3TXKF6GhhGfI773VM0cINdRxD7NWyZ5hPkYgiDnb34F021H0z54J3ZMKLDbqwKPXUx7X0LAUN6iU6rKtVWDdkPi1YuWqdJfk8jZLoc+DXiEAuA2oDFsVB6I0KUKnmSLHzlkG2o4ovBKPn7ouGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; c=relaxed/simple; bh=ud/yG1CR5QNIjOMJtgHhzLjfPGyRK5X2yNstenoh6F0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h9uLqcTx/jEibd+vEMlmKdKxy4xXA1cI+OhirZQnM6igJj6TxQHlCaZCAguXzPwWbpdVAPE4qpbLGwVl4G23al6lkVs1c/4bG1CvEK3xD3c2+8sXzeU3ho9+/dlzB/zx80phQ/7fOuc6+yLyk69q5fSYtG/EonOwS8QxZmw9gGQ= 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=Zo+alpBC; arc=none smtp.client-ip=209.85.167.53 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="Zo+alpBC" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5534edc646dso1388092e87.1 for ; Thu, 05 Jun 2025 10:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1749145989; x=1749750789; 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=V9Qke5DC9C5R7oeoSiHKicNykKWx9HQwgMxvcWAUcsQ=; b=Zo+alpBC9ydAquWIpW+tcw7w9hjbZzS3WB0v4tV40PZFbtfrQA1Cmtckr2j8Krk+za f/A75+JcseniPbhdkoDdrYYQbkmzdx08B52fi0TIXzLMrNU4LxRF5FOOTDMQNfyQdwiQ hDMcCBsfKo7IkwzxdgV6Crsjoi/fEZyEDyF2o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749145989; x=1749750789; 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=V9Qke5DC9C5R7oeoSiHKicNykKWx9HQwgMxvcWAUcsQ=; b=KScs3hKarEeyIjZncMRLDiOLDgVRa5AT8NmBvph1Rqn4KOWGKlT8B5Wv/ggYvcmweC l43mIJZES/9x5TqxC0NIVB2SsMvsHWFMxgs4p66L2yX50mnXx0SA+Mm488jWQwXgOjr0 EpH8hw5IWiw15QUJpK3CRuhDXdfASb4e9kGxuNZn8pCjBhiSm3+c7xWp0C10vDcA4TU4 Qx3fOzUWlkPS+o2I9Y+oNYf9ym3Qfdi9kK8r0UiD0x9cSibdfsVn2sBvmcwq3pVALP2J +RrRgvwsuSp+s30Xb45iIeM0+kOysZhVmg+1gh05oqE7SHRWDwyBI1mQ6zsIAXd8UY0r Rvqw== X-Forwarded-Encrypted: i=1; AJvYcCVtk7ro8mFuT6d6art2ikrmYwm3aJrLi8FdU+1xPlZnroqcLOrIVDMxNcWZA9vIyx+GDim2iC0DAfDn@vger.kernel.org X-Gm-Message-State: AOJu0YwEI+uLfaK9T3ErOhDwK7t+TltUE5/8Y6RyU1VmkrutiIu2Qkuz Ezr+CeXOdeJVrBx8otnbAxAzPXcoORj7N+plvab8bG/jAxJ+c3NhdQ6t82putu3AXg== X-Gm-Gg: ASbGnctSazUol2w1/vjtWBoaPDUSZLx5kVJuaqR+1saagtg8fXNqXZiXqkIZnWzV3NQ L5Z5MxOjGFRHJGB+4T6TIrUVWjsQxHYqx7ZIllPtZLRTUTgea07rLrU1u3zo1Yc3NWALR07C/vy aveS67fsh4oB4hdwk9rjpmYfKDLJ8hAkAKECUb27xYbMpbpyY96cH9YW1Cjzxk7sX8/Gij6zl+r /b5zNOVwgBL/7y1cBKkFAbWm9y2k4sAPmSO/+UhkGjnO5S2mHe0ftg9pHX49atMsEIw7LxTm3yH jbwrQUkJs2HFqHjyVyu/zjtWW8PPrjAQi/GrPFC6O/ZlgqRAO5n2Dmh7swQgpuJCzUoCvP/93Ds rniXQMJHy8KGbxQeb5AbkZgT7vQ== X-Google-Smtp-Source: AGHT+IGkU0Qv4tzSIKsGHyevtVEeWEZfFr7MOjKvYk6divFF106BKU0YcQGNBaigtq0IO3jXnttxCg== X-Received: by 2002:a05:6512:3da7:b0:553:2698:99c0 with SMTP id 2adb3069b0e04-55366c0e612mr15721e87.36.1749145989470; Thu, 05 Jun 2025 10:53:09 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553379379c2sm2641210e87.251.2025.06.05.10.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 10:53:08 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 05 Jun 2025 17:53:05 +0000 Subject: [PATCH v2 12/12] media: uvcvideo: Do not create MC entities for virtual entities Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250605-uvc-orientation-v2-12-5710f9d030aa@chromium.org> References: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> In-Reply-To: <20250605-uvc-orientation-v2-0-5710f9d030aa@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown 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, Ricardo Ribalda X-Mailer: b4 0.14.2 Neither the GPIO nor the SWENTITY entities form part of the device pipeline. We just create them to hold emulated uvc controls. When the device initializes, a warning is thrown by the v4l2 core: uvcvideo 1-1:1.0: Entity type for entity SWENTITY was not initialized! There are no entity function that matches what we are doing here, and it does not make to much sense to create a function for entities that do not really exist. Do not create MC entities for them and pretend nothing happened here. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_entity.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c index d1a652ef35ec34801bd39a5124b834edf838a79e..2dbeb4ab0c4c8cc763ff2dcd2d836a50f3c6a040 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c @@ -72,6 +72,16 @@ static int uvc_mc_init_entity(struct uvc_video_chain *chain, { int ret; + /* + * Do not initialize virtual entities, they do not really exist + * and are not connected to any other entities. + */ + switch (UVC_ENTITY_TYPE(entity)) { + case UVC_EXT_GPIO_UNIT: + case UVC_SWENTITY_UNIT: + return 0; + } + if (UVC_ENTITY_TYPE(entity) != UVC_TT_STREAMING) { u32 function;