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: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: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: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. */