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: 894352 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 2A47E2798E2 for ; Thu, 5 Jun 2025 17:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145988; cv=none; b=FW8Q3ZmxStO5HLsIHot6elS5spKz21gj5TR6Ei5bU47SDuukWyJJDBUca4psjAJ1YwAkXyME4KW2N22/NDasvdB2tWYOKU5KPpwas8nCGy44qCz6maG4bd7xW7jwzDsSWPRbvjCM3KCh6s7kP1zcPA73FdDx1VkMbJjf39rk7zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145988; c=relaxed/simple; bh=eN2NqpRnpXYpl4E3GCmZNzKt19bmwjyh05by15ZauKc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pr5Tpdk83sClhm+Vjls/w0KapRt9BV9MNUo9/Qm/2+e57z2qrj7Ju4eHMfjPKF7HQAd0jegIxcRNROPjWG9XTvgP95FBTrePirGA1nb4hnHRMA6jtJzgPI9k9RoSzF8u0KPlCKNdO456l7RwF8OLDUsleOmzPpezdYVtRCMtDTY= 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.47 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-f47.google.com with SMTP id 2adb3069b0e04-551efd86048so1376037e87.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=e8Y7Vs1Paj016CrdlTt2nwS+2QgvCinS0gSqckUnOz6hXO6w+lEFcJJC42bHl1Z3OI +oWcds5yWLxZKMz3q5rGnI75tmnIkUZsLnA8X4c3XEgmZ0Y85QZXIpajYLFbp7AYWRRT 8vwTOCoXjzWF+UdriNfDCOJYMeWSHbJbfBYk6mnddZNtWK9grC8NA8pfwcHXiIylHpr5 gRm2V0x4BOoVQN6cO7WyjWvgCs8QofGJNAeL7WNHWXtKu6y/pKfC/IocaQSpUVPNbeAj N3b+XPMtoLdPgq7Or8GRhaglRYGUA2l+MBc2yYJCZ0VLaMxIEtlZrSRUfvIPXyNeVUST aeKg== X-Gm-Message-State: AOJu0Yyn6h+qM6j9jHBza1zF6eHmpIVFnD0v/eWnlFiMuEc7iTjeIsCW 9Ru/P0enwpOKGcFVjKa4KkOPv26X9BmFJmjP3PGknxGAj4Beux/2GtLxs1nuV0UUnw== X-Gm-Gg: ASbGnctxEawvDyNdePRY/1RWl9iUEhfUT92duL5NIFlC0ypqERZ9n2LNxDIeObqCC/H bkyDNG0FTY0LdRzIoJNRJ7KxAf/dowqpQMCQdAw9UZYPShvsS4PFbM7w5YUBOWM4E2wTP0GmTqA oR7FTOFcCrH7j3a1d4jjiZbDBnEibZZqFyEGq/6PNaD1tqFWvZZgNxDlGqY5MFxHSchrfjDayR6 qVrxvfvQaJvAMMSE4xsGIGVuaaVKvOB9F6rPOazpB9vslSL1vvwhjmA0TNjZfAGcprE1TGtrZzs NtJn5mbgTWEKkvgx80KKgaAi4+Rvvf6vjcRzjuyDWD4WLw4XbI3L65wxhBvu2/JWmbC6I3Po9O1 zaQ0LO8BWhiGReRijK16VQ+OoWw== 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-media@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: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: 894350 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 6F38727A440 for ; Thu, 5 Jun 2025 17:53:07 +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=1749145992; cv=none; b=SfmabY4LL4qI4KwTtbGjTcxbHC3EBuaoG7uFzQfFc+vDeZb05UgkQHtx53TiRqq97RyIKwACM2AY63PcfwOCGfR1FgN7UUZfWa7UubbEr/Coi8IM0ZhvPoPuOPHAl8D/zvrrvUr+OwsJiMsOKzE9JF6BibDbdJa8EmGi12F3d3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145992; 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=Qy7ZGVZ89D9LpL8GIQgsKLA1ULBRmmfeCCqiTKlIuaq7YxuZkuhaV51/wLcdneEjmT+KbBXqI3WZSXiJ4uReKzb3SFiPO1xwFqa19wGVYMyDkeBr2ZPdye+COksx36uCXbgLCtTko9A08gZ8BE2SGasN+fU9C5RLCxPouj9mhOw= 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.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="mAIbvnSb" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-553543ddfc7so1375588e87.0 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=N74alfSoOPkZmNJBDJWz8DjN5ZyKuKBS7E6WPJyIxmxVm/ILlrhL7w7R1gciLSADX0 2C8+8AHZ+ma26Qo73MG4oObHo7OAGmexT1rBgunYosvoZswEmvU3hRSJVdGikhmqzZtG rkhHFgR0966LML2c5pxXbZFqRsT3ir+tcYwLnKTPlJqeK8g8s3kV/pFUnB17iDkwUA8b 9eDItO+kgWSUhVyQVOujzgd9rar0HncXKuiUXr3D6XJxMLim86G81B3virlzy9KuCpQl PkDiQN2HeWwy9TRZZ9WaoATz8Fo0Gr/VcwAfXrHWQHZpd5Rp4AICTsQh4fd+Kry5yHww ckkA== X-Gm-Message-State: AOJu0YzHgXHdmILX2Q62HpzKe8k72UPjXU8USeXK0BAySygwaAadC3d7 0ztNpF9umjCsWfwEfAO66hK0bknoCKPNI+bLMyDXp0xcGm9jbLLoxzUCaAzSsDYM0C/sm7stx0O bLzE= X-Gm-Gg: ASbGncuqiNQcKP1PMeOs+msH+5xObdo049oOjcPg2Je0l6INPvsIYJfo8mPXND8nihd n+px2ju8Ktc2uZdAeszK+z8350BIldSEZ0b13Z1Yvc8/D+wlMklMDAr67JyePVFy5cpox3Fom8W 8hRgWM1iLGkm77tFl065TGWIXq2nlE4gAWPBBChRtD77mtsRkYLOOCim3ncpP13k8dtCu+uHpb1 iKL2jae3E1TIcuIeenmjf90bQNTMnjFZ83L670Gv+lBjyLEIBD1F5L+F735GrXhx5K2W4chM+hM td7SydRtbmg6FcKXikLPgHLeL75FWh5P9TP0I0KFD1ASclV3tAShQIPbXzXlg0c9ZoxKq7zwzTo e+Odoi69rNZ2FFaempivgmBsmag== 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-media@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: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: 894351 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 0723C27AC25 for ; Thu, 5 Jun 2025 17:53:08 +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=1749145991; cv=none; b=oohtJCiNVvUIQGb3fMValm/5J2WHXcWH2yvMYe7rBFiEk/Rofki/eNv2Tk07osDYyy0o2orXC9jB9I7S4AkhGTu/tw2zPxsa12wt6T+W2rTDsVhfz7qsOq/MTbukxvHmqFYkVG0IQawyUTCwNcw8RcsevEeuRFyrZG/TJ7/z4yk= 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.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="aCh43tO+" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-54c0fa6d455so1344600e87.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=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=YpUZZOtifSKnejIsddHgj4K+z+uPoGJ8POP9H3bpTRUEU9jDI5+HjPiCtgUCTzv6Ma tkZ8XLLAJb8xKeQBgY6NTkUVO6eiToe4jlHXrjNRoTEDgLcZ7n+HxOz4Rhq/EmGjlp+h cSwctvYrh+4umigbFEvOTT2nfHohBGg7shP4eVldHYzcZ701kRIyidh+ok4pfPd+tt/J m2cZCH3IRc3Qs+HOzRwVnIQE8CUGr7A2j1kpfsZoFsGo87fvcdcRbo9JCEOs9TOMUf8z mdjbqxPOr+4DbtsJFSAyUBvDsJdqiahKMMfWVwFCtu+Wo5Z4oU9UG6uZ1PrK1QXb6hRa MhaQ== X-Gm-Message-State: AOJu0YzYvN9uoEIgkbwxYIvoQCJfbLCotO37uGQTQmrENqwkL8gH84pv Q/UrTRkiIIxB1EiLPzZ1uJ1E41KQIONQyGP8az8Fv/wBMN0QpWH4pM9pG0ygl4BmUQ== X-Gm-Gg: ASbGncuUlwfKxxlIIjp2kylDv8ST/a6+Oh6TcI2Yj7Hage5kk6JOQDfi/zdIstn8CEl QtczawzXSWxpiwCo14Z3sidz29ujlBr2tsZ/uQydkPu57vBomZ2VHgUHWe6HJMsvjyqxMSspsDE dVveOpTISQ8nZqAzxn64ygOrpvj6/9cc14q6ZqdGzDgMZ7jcUR8jHoXI5fIcia75nv36OW08OjO oxdAsQWaHTiUJYP4u2YnyBrDf0yEyZA6a8pCNi2SZidRK7fDJk/JUiTutboiIAUQZzYnrNWuoWA DKL6bILInpnLdWg7wX8EpfrM7YeAbBdCjIGukfUTyMrvT4FTvlSQ6O1ODyzsuraKoY2WMEgQdQn F7xE2bMekTVfWlJQiOuGgJLntQA== 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-media@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: 894348 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 5F1A727AC43 for ; Thu, 5 Jun 2025 17:53:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145996; cv=none; b=cKR0KsdthXzJ1VabIQVB6Yd9exYP+Vxki6hf4An57DTV6J/h08jXOfU4tEgRky3uDzC3vHd+V/eakTlQY4wPapHdPGd6tpohIW6AjQ00z5Mr3PB5qnBh/V8ekN8pGsL+Xa1NA8RIQ5Cjg6JRMgBqw8qqM6T93rJ/ohH1BDXqDLU= 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.47 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-f47.google.com with SMTP id 2adb3069b0e04-54c0fa6d455so1344619e87.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=bRRfOkC8gMacNi24gNpFnUDq5jFJlWfQg4KMuRVw125n3lULQudOXFF0twu9gSNu9p l7sCrmPVduzerTsc2BjLEIaWiiD8GvC8q3MUYwwyjq2pkdEc7KiOF+OfVyv4g5q5ByjG 5zX1qDB6dypx8U+iSORfK3SWgeU6gHOHIQm+NECSYISuHZ/whtsR231T0g1O4C+QT6Xw fZJwxsqYW0FPh16rilFFprRbJQK2Ieb2VeZtLtSMerBW1TtQpgF8BBvatS85jFeFX0fN 1dVUeD8W14CWJ9owr6o4Pbv/qsGu0+xiKMY1lHLaFKfCWPa4JA7uz6vmysuF+v95w2Hv Ngbw== X-Gm-Message-State: AOJu0YzysI8UX6kmktakXODuI/hTcJ2Yit5q4AX4VP4aHlsBL/67s30I xPu0jjdOxS/YSOqDIXr4uF+e4L/w9lrDbny6UipUXwRE76+DirxwruhnI9jqjOtx7g== X-Gm-Gg: ASbGncuxZ2CwfbrqzxCxH6EyU8korUJ49UnJDsbF98u+rNr4GuAMCAY60hzJ+/2zqAn ceg9JgAPytHORfNMw3fUiNgsvHJ4jenCvn0nu6me/JnROqjOHm/ZYbgTELSu35Gf7imqG/oLsPX BDo2LUL8Hek21B+J/dqktGqtnR2sgatDKmLhf90RukA+GsshRT0i1BiKvJEbZIn5pmdDtNLg51n FkrMm0SvN9TxCYWfr/GDfr5HgbaEqC9DbG778XeAKMZBvnT6beUWKxsxoCRHtEXacTAYleJcrzi kXn6SzohjFwpXnHeJRgAAi1lS0cmtuO8HJjCgLm+nBpSpwBccPgXkPcMKQSAULaVa8X9Y/mCKlq V37+yVmfewJP23tJ8HOk5+n0Mqg== 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-media@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: 894347 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 B3AFE27BF83 for ; Thu, 5 Jun 2025 17:53:10 +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=1749145996; cv=none; b=oY7UMmFquAJFlI/B21UeKSCuq6MJPvx9RGKTe8hcTfkxYbzGuMKXSG6pHwZ0+mlElZApZp8lqj5YrXeXxKj7MXAAa3HY0zaiZjk6uLOAfAEIrcKjMnxhRqtRTmB6ZMbkd8OaHI/OeRTgilX2YU/b/hzLQXLeJ53+VkHCgF7yyZw= 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.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="UHkseJYV" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-553331c3dc7so1222583e87.3 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=xJ62GZ+tuyV4vLGMihYOj7DvkYueAExTrIxe6LpB96DsyNeaZzLz1A5f2shVhDgYxR EUUK8bUlm7gLnVp3vdhHwSt8E8+fYEdIpNVqq/Z78UdUNiGcjMwiQEVqenhwQd9wGode v6W2J5rf5lfjsoF71FPgC5+bOeJuzOjiujv9jPnzBKZ0RmIrolLpbduD4dHRoBLYZX5L CBprYYYr/qWb4GMvpCFpfpF6bq4tHsTuIv/nrXXzBdSTFrVneDAABMbOS8f3Y6hMrGu+ 6BonL/5djOnuw/n5EpeCcVOOWFfUoYqQ1lxAWpS207aB3T4lxe748ILpBeII/XuBzpqJ eOYA== X-Gm-Message-State: AOJu0YwjHfLxCQSpjfLqLQQnQNfsiA/v2rj2MMocGH/7t5i8A3k2/g+l siCxMkHUU6JhUc7AS5pSXZfyo75ME+3F7k79Xw2OT/5XF55Ax9TxSkhh3X+vbjOI3g== X-Gm-Gg: ASbGncscD0Xkp5PmGuogsvHmCjhSZwqmeJjXrwR2TLp7ZQypcFDYDh50KGuVH2TgUVr mafTeI8QZ75UOdQMaRCJxi8AlU9tmXjjfoo0wB0fS5Ew4dX/HL1Ot3Zdg5gh0bnQDriQWZaNEy3 s0DbnDsZSDX7TWEN8EEnmpmzSztznVs2LYYsbknQOE5f9snFzhwgI9dCgD0ajI+wHY2hKBnbunv AVUBSOxsyWy8wefOKKL++bWi5/Nx4NdDdiIZOukT2O/ZX2AvR2DROdBeUNJEifc17kCE/xQVani 0Whr3mSfZ5/Yr6Pyk6prV9bJcw+H4qV2GfKd8xwgHxauFQShSpJXmvHs+WtusFnxqHidVzN1jpr rujZA1/a8vLYA82CK0QWeqA8CDw== 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-media@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: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: 894349 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 A960727C179 for ; Thu, 5 Jun 2025 17:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145995; cv=none; b=efZER6PSpT32wVnjraKmUY4oYOSZO81a2Gw6QhxvWtd1Wh5W2rmg13qxeGmGPnpPGRoMGFMNTDQJpadRDkN3G53BEYjN9lL+8Y03nEeN7T9NDrU3P6puqt2DLB4ge3Bg+kWRdjL3DqBgxnw9GWBF9zoRkmw4T5A7ZuRNIPqYmgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749145995; c=relaxed/simple; bh=7MKTDlXdmTzEBoZknQKsTqh+wgws17pHYpyBR/S4V4U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KwemnYz0wqJScB6SHrDwRqmq0KM2OSRUYWJMes8rRq3aWXnUh2q9wDn1hnO1ZKBUep04ICKQv+kQWcbk0CXirgDbLCkG0vLcbNxTFcrCzQ5gGJ++ViNooEWc6RaiK/6w5eFDdLcYFhMTJbmAqWYWY5GcbvG15u4bioGtUy2zxRM= 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.43 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-f43.google.com with SMTP id 2adb3069b0e04-54b09cb06b0so1511265e87.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=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=M1c21tHtedoMKqUvy18NEmAFaolf1Bx83AF3M7m4YdRgytOXY61CC6mNovWoG4rSuQ yaJhG+GhsWyFooJddscdBSpVzUHOVHAeYUWTB21ohqXvXV/SvmbjngVlIKgMn8RWP3bB /tAqRW6Z8rZgFF3d3+4gC6s6UMHaWrap/3S0KW7xR5IHDq9JYCq1fBkyBopG/LuvaFIn Uhr3NQ5e8BVAEWAIH8c/DgHJAUAxKHrI7C80/N02bESlvLczvlyId7VV32n1zAHINpLd RqgMJGNHWUOyxVUJp6uG9iyfIU+16KuXR0L3vYli1d6+KQ7jxz5B3/u4DuBx/yOEJ4DR EeWg== X-Gm-Message-State: AOJu0YwXHDO3NBnPyLF2Ij6AYpvO6oLHgK6z3C0BSsxglPi2Ac1p0Tuv BvVy1ADWFa+c+jbKYTDkHqPSEc9EfK1pJSStQPVBsuRPIaHUcOJv5eTpWSMlkTVnhg== X-Gm-Gg: ASbGncsrh8RVhxUQtSbXq2MjAhFkaVrF6H6J+hHhTturu/Vp1FYuhWBQxyqwTqCERyW 3Il9yuuNtJO+5bDVb+1vAs7ZpjjfQj5IitVxYsHjXFNyoVGoGnxBgHdmBk/wADVpX2sfUVhkGTr pv16GYBlqVoULwSL4fry/OUq8aCQLR8WCzVuFn7qIlTktCDtEB5lCIln+rZqFVP7Kgfx11ArghA Vdx9HHdbL7qapOC8RUrQGykiMGlPtLUwra0cimjcf3twfcjkdzEIRBwpKTJ8bVD3NZBL/Ty42zA +G102ShanFQVjCqDKzhB32DcWIYuD3tJSYZbHnQ22RakDiAx5cL3WKhio/1LsUqe53nCDY4RbCE 69JGalluPnfPrISzj0jaG1L7H2w== 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-media@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. */