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