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];