From mboxrd@z Thu Jan 1 00:00:00 1970 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 341C32FB0AE for ; Fri, 26 Sep 2025 13:11:39 +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=1758892306; cv=none; b=nhN3Rr1NofD1JUH+a+9l0GAKNLLDx2DEKT101UBaBpRiuiXtLR07ZajtLgL2eoRVESKZhV8lVgzvQXOSYFMnx4SDqQZImrksvccDf4CSWQgnh4GE2SLcM5Q3cYGq2FD3u7Xzk2TbkORr2IJ7ILz+N6X4lIiwB+3xJ5XsL/3qSvw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758892306; c=relaxed/simple; bh=U08jW+ROLINfuVWgmwe8cpKgwKy+8J4DAE40SSartDs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mVMPNxLz1/QDU815hz4nuKe/EmSoNcS3uPDINBFwZyIwE7/n7RAE2T/nZc3PUMnfCALbxSLG+Vs8WG/gKFPoLgBJKZ963S4bfebdmLNINns5dKaOsCtqbfjdbXrOS7FAsf9N2Dr5hGUe/+unttbsnLAfdso7VtLUhqaSyB6ZscQ= 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=ND6vetiw; 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="ND6vetiw" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-57edfeaa05aso2333877e87.0 for ; Fri, 26 Sep 2025 06:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1758892297; x=1759497097; 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=APb3UWCYeewnPsuy/XgWoHvego/0/pU0ggvZnaK9xZ8=; b=ND6vetiwvc8HvV+F8PpwSZeponpTkVOf5zU0YmtnnUUCP8C66nPIBYxDAYak2CQeVm cl48LslOyRdc1AONC6xSc3VxuztWKnr8TSXJ+sjOj02XNsqa9dgtaQ26E3xdR79Sx5Vt VpGuRohS9CbTcMn6aNlChnvA4ez7OdXXhTo4Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758892297; x=1759497097; 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=APb3UWCYeewnPsuy/XgWoHvego/0/pU0ggvZnaK9xZ8=; b=hWOjbkaFJAd5vZBJPy7K/lgjd3x+84cMu5goA3cgx4BNhmvzATEulQ/P647tJTqVuU wdfNgeBjBWMDaXqulwwzEteIH19vIFP/3Iqc3EGsAebvBhXViovAOaiSFQVZ1GWI59vH 2g94VvP48+fH8A7fW1aYZC0uOF6VgQjlY7mFdCP6UMHPuHeBupD8NPatkELsa5/3xDnm b0a7C8ikdjPPmGIok2aeXY/7DChQ1281Jw5x3T0azaDi0lNKkc0UblrkfneLtMgsMzza KhyFRhhF4XnY5zVyCKHT08pC2agb+Ngztsh9NDw4c3ABd9gmdV3mfli5U+RZ2IEePTnq MDkw== X-Forwarded-Encrypted: i=1; AJvYcCU6xqODdghTTgjx5aZ8oXeYnmThE2xzTjk4r5v4qkCvesTpML/nSQ7MufMnVunfUrTAFRH5iNbpbVhV@vger.kernel.org X-Gm-Message-State: AOJu0YwssLFAQcDfXMajdhYhJ+HUJNcv/I/m6hzpgKHSj1dJM/K1YSIM PysgHj9enNzqTkilyuc3waAZstrDKPwkh2YnzdUKCPpWfGlDGHJyc5xyz+euThWtwA== X-Gm-Gg: ASbGncuGwvn6wKm1GQOxNb9lDuWWTPbYNjVJ4n+3jJmyPMO+JpieleUePOzpGbiQEN+ Pm0Yl/qkdhnOCsF/Y8CfYhhWLgjec7eY2TcYih+sPIZjA7nkrX/zguEkDqgQ7A5BFiTB2AOIKr+ k0o0c0nOMl/ixroWHK3ZiQ+1eYqpXDquQ0jpudqkQWJhXbCQDcsVptQekNFHwqE6vbrj8uwl5sR X1jePjNYZJ2sdf158e6RjUJb+wPQPe+xZWB4MjjsaewO7qr/7/bObRHMrwo34av0+eqV52xaBZY 8fAqMK57+p0/OHc+HWmgfU0OH2N48xlTlkC1HUE5shBvkkxePXAXBO/N8x5MmfjID5anTfrCD6w O4Sk6ZhYVvPhG0eZWYRjjfojH+4AlawbSGFerRCzFLKEGGvirZLRF2my+pDiEksje3llVWaaNsY /TvQ== X-Google-Smtp-Source: AGHT+IG13LZH3qyc8t2QDs0MQunt54awluMMidrJtB7qriVpX4diWPLucIbGRhyJDMPwZ0BJ1XUdKg== X-Received: by 2002:a05:6512:3b20:b0:57a:8738:4d80 with SMTP id 2adb3069b0e04-582d0c2a62fmr2064511e87.21.1758892296980; Fri, 26 Sep 2025 06:11:36 -0700 (PDT) Received: from ribalda.c.googlers.com (64.153.228.35.bc.googleusercontent.com. [35.228.153.64]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-58527c6b014sm123872e87.43.2025.09.26.06.11.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Sep 2025 06:11:36 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 26 Sep 2025 13:11:36 +0000 Subject: [PATCH v3 12/12] media: uvcvideo: Add support for V4L2_CID_CAMERA_ROTATION Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250926-uvc-orientation-v3-12-6dc2fa5b4220@chromium.org> References: <20250926-uvc-orientation-v3-0-6dc2fa5b4220@chromium.org> In-Reply-To: <20250926-uvc-orientation-v3-0-6dc2fa5b4220@chromium.org> To: Hans de Goede , Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Linus Walleij , Bartosz Golaszewski , "Rafael J. Wysocki" , Len Brown , Robert Moore , Hans Verkuil 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, acpica-devel@lists.linux.dev, 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 | 41 +++++++++++++++++++++++++++++++----- drivers/media/usb/uvc/uvcvideo.h | 5 +++++ 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index e99fdf4bafbea662556798fe345a48b9ffd8467b..99bae519ded8910a37ad2f2112fbcbfdcac671af 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -387,11 +387,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_CUR, + }, }; static const u32 uvc_control_classes[] = { @@ -1049,7 +1056,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, @@ -1057,6 +1064,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 eefc5d08e370515181f74590f2f38189770b01b2..e180568efa802fb348dbf165da62417631ff16fd 100644 --- a/drivers/media/usb/uvc/uvc_swentity.c +++ b/drivers/media/usb/uvc/uvc_swentity.c @@ -12,10 +12,11 @@ #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) { @@ -32,6 +33,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) { @@ -44,6 +70,7 @@ 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); @@ -51,7 +78,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_new_entity(dev, UVC_SWENTITY_UNIT, @@ -63,7 +94,7 @@ 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; strscpy(unit->name, "SWENTITY", sizeof(unit->name)); diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 04ca5dcce11d902dbfdf32f2a962159ba7940a39..64c9a597cc533ebf3a305060294c7045e32f72b0 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -47,6 +47,11 @@ #define UVC_INVALID_ENTITY_ID 0xffff +enum { + UVC_SWENTITY_ORIENTATION, + UVC_SWENTITY_ROTATION +}; + /* ------------------------------------------------------------------------ * Driver specific constants. */ -- 2.51.0.536.g15c5d4f767-goog