From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FC291B3958 for ; Mon, 25 Nov 2024 15:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732549822; cv=none; b=kvmtt+bP9EouGGTNuJE84icufIIWirP67diPHGZuk0CQIjbjI07hjqw32BcyPg/I7L6Dt28TUy1vrkvgr8u6kmIoIkYlFH3A5KHrPew7XjwzDtRM1VkpeFSM8Dnax++nwuqVsyiGg7vKOhX3Qh0IyjD0zLfGBzLNeVaoOcEbcNo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732549822; c=relaxed/simple; bh=kfMHB3RJjnlbzO1OpVGbhIstSz4cmx2aTUu0FTGJNng=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=WjTii6TtrGqvNM9CTuE95kmhifdnuo10ETYV2diMe0r4GNqM+H9TzBQqU5sOLAKpls/BpDACXu6V8Qg5B9C3t5r1UPpFJaZruPntp0kPFMqj0noRnmvMLgGbta/jmoOBh+80F2LllEurix94i0Gk0pMpYSn6+ji4SG5zVDmugiQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Kc5SdO4d; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Kc5SdO4d" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732549819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nQnkgAjPT8jFYPzn3mXbirErF6dgXKuZNcTSfMJYSzU=; b=Kc5SdO4dXIQ/K3zDlAsrvOLWmRQDsSlTEwK/60KAVzMD7hHzF2MjNBUPmjEegmzMBiWPoe tZuQ9qFKfwt1NQzTenrw53y8A2lcIJKohvsu7c7QFTdYfJYLneLs+qkHu7IPCro/K32w5k PeUT1ukymsAsD0ItkUZzqjT6a7g9XL0= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-270-KIhO58liNhqr8ODFNX5bAA-1; Mon, 25 Nov 2024 10:50:17 -0500 X-MC-Unique: KIhO58liNhqr8ODFNX5bAA-1 X-Mimecast-MFC-AGG-ID: KIhO58liNhqr8ODFNX5bAA Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-aa5160f99b6so193884766b.1 for ; Mon, 25 Nov 2024 07:50:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732549816; x=1733154616; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nQnkgAjPT8jFYPzn3mXbirErF6dgXKuZNcTSfMJYSzU=; b=DACahz7GFg+aNKg8MeBd2wi42KdSO2/ivFvBTrb+pWP0CpznidxTuv/UtULoDRXxAL xTPbKF8f4HDqIob8GRjIAagU2JI/MEl9vrZ+waXykPLoTGHi99Fm1gpc1cXKHHJ57J+N DepfZ7L7nc4dosZYwi/ZuzlkADT1UWcVLz26DuSsuro8y9ftHqjXq/To45W1QuPyQI9z oMAp8ERtLKaX2cC+3kMDmA+sqNxKV8aNp6WB0uxzV75ypbMnSjVht2W4gFnX+8H0Au3t u4uY7k+GXifBvpF6bF3w8DlRTARCwCaphy+IQCcwcQhwdIrNSlNhFLvMEK4003Suygph cpqg== X-Forwarded-Encrypted: i=1; AJvYcCWZlRpACUiIUqipQBqPd1mJMt5bHsoQ2SFm9zq7QMfttihFiEOE+Kh+7ob4VPNzTUEc33KSCP0u4vPB5w==@vger.kernel.org X-Gm-Message-State: AOJu0YzGxpqMzY97JKREWx9j9P0QiW2XmO2f9YgnQotX7OXgpWyuVKT9 3SVGykNaxLNKRRNI0vXuFT1nHXTDPGOVfUtB7NWUYpKedIXzOwRoRDr+/MMRTfCIsbRv7Hkd0zs yTYr9utoOxLBrWFJY7G2ZLng/Io3h3CvzJSDjD3W5LuyuK09ReAN+wSulW6e9 X-Gm-Gg: ASbGncve+O1RIbzmvqcmfh4PGo23kbND/8zyBQqeZLLS8/qKoIBGyExuf4lv/PAm3kA gL2IXjOfi0PDv8UDai+PW9KfBZ35kGRZltSwjnEm3eROF3ValBFdpRSzQH0he4f1NJl9sT4QZpB NNgbDmfLS7LodikY6q+jCOjB6b45yTExlRLVzQIBCvOQiUlsm5gnGYMoC/+iSSjqhfo1YzneauU m79C7ZIJ8zbd2ARiWPk+cNL8nL0nXQEvktdAOvXz8mFiDcdV3lJG9Jf2UPRrEUG6zhrhJMpKinP tQRC3+b+WYPIrpfqTz8QQf5zkC9jtvlRVGw7lfJHoHaeQ6lQGjncp5ieO8ob0Eog1prvQKY0m8n 9SYS6Ctjt1v7B80E5Zd6DfRfV X-Received: by 2002:a17:906:4c1:b0:aa5:c1b:2203 with SMTP id a640c23a62f3a-aa50c1b22a1mr897054666b.42.1732549815813; Mon, 25 Nov 2024 07:50:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHG+xVc+WRWlgy8t3DQvbGAQE/X9x6Ysv9LBZndFPpM5k6tbAVH6eP65j8ocm1tz0b2PWKizg== X-Received: by 2002:a17:906:4c1:b0:aa5:c1b:2203 with SMTP id a640c23a62f3a-aa50c1b22a1mr897053066b.42.1732549815427; Mon, 25 Nov 2024 07:50:15 -0800 (PST) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa516396f6asm449690966b.158.2024.11.25.07.50.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 25 Nov 2024 07:50:14 -0800 (PST) Message-ID: <9be8f912-13b3-4b7d-9705-8ffa3a27d205@redhat.com> Date: Mon, 25 Nov 2024 16:50:14 +0100 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v15 05/19] media: uvcvideo: Handle uvc menu translation inside uvc_get_le_value To: Ricardo Ribalda , Laurent Pinchart , Mauro Carvalho Chehab , Ricardo Ribalda , Sakari Ailus , Hans Verkuil Cc: Yunke Cao , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org References: <20241114-uvc-roi-v15-0-64cfeb56b6f8@chromium.org> <20241114-uvc-roi-v15-5-64cfeb56b6f8@chromium.org> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20241114-uvc-roi-v15-5-64cfeb56b6f8@chromium.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 14-Nov-24 8:10 PM, Ricardo Ribalda wrote: > map->get() gets a value from an uvc_control in "UVC format" and converts > it to a value that can be consumed by v4l2. > > Instead of using a special get function for V4L2_CTRL_TYPE_MENU, we > were converting from uvc_get_le_value in two different places. > > Move the conversion to uvc_get_le_value(). > > Signed-off-by: Ricardo Ribalda Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/media/usb/uvc/uvc_ctrl.c | 77 +++++++++++++++++----------------------- > 1 file changed, 32 insertions(+), 45 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index bab9fdac98e6..77f7058ec966 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -862,6 +862,25 @@ static inline void uvc_clear_bit(u8 *data, int bit) > data[bit >> 3] &= ~(1 << (bit & 7)); > } > > +static s32 uvc_menu_to_v4l2_menu(struct uvc_control_mapping *mapping, s32 val) > +{ > + unsigned int i; > + > + for (i = 0; BIT(i) <= mapping->menu_mask; ++i) { > + u32 menu_value; > + > + if (!test_bit(i, &mapping->menu_mask)) > + continue; > + > + menu_value = uvc_mapping_get_menu_value(mapping, i); > + > + if (menu_value == val) > + return i; > + } > + > + return val; > +} > + > /* > * Extract the bit string specified by mapping->offset and mapping->size > * from the little-endian data stored at 'data' and return the result as > @@ -896,6 +915,16 @@ static s32 uvc_get_le_value(struct uvc_control_mapping *mapping, > if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED) > value |= -(value & (1 << (mapping->size - 1))); > > + /* If it is a menu, convert from uvc to v4l2. */ > + if (mapping->v4l2_type != V4L2_CTRL_TYPE_MENU) > + return value; > + > + switch (query) { > + case UVC_GET_CUR: > + case UVC_GET_DEF: > + return uvc_menu_to_v4l2_menu(mapping, value); > + } > + > return value; > } > > @@ -1060,32 +1089,6 @@ static int uvc_ctrl_populate_cache(struct uvc_video_chain *chain, > return 0; > } > > -static s32 __uvc_ctrl_get_value(struct uvc_control_mapping *mapping, > - const u8 *data) > -{ > - s32 value = mapping->get(mapping, UVC_GET_CUR, data); > - > - if (mapping->v4l2_type == V4L2_CTRL_TYPE_MENU) { > - unsigned int i; > - > - for (i = 0; BIT(i) <= mapping->menu_mask; ++i) { > - u32 menu_value; > - > - if (!test_bit(i, &mapping->menu_mask)) > - continue; > - > - menu_value = uvc_mapping_get_menu_value(mapping, i); > - > - if (menu_value == value) { > - value = i; > - break; > - } > - } > - } > - > - return value; > -} > - > static int __uvc_ctrl_load_cur(struct uvc_video_chain *chain, > struct uvc_control *ctrl) > { > @@ -1136,8 +1139,8 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, > if (ret < 0) > return ret; > > - *value = __uvc_ctrl_get_value(mapping, > - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); > + *value = mapping->get(mapping, UVC_GET_CUR, > + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT)); > > return 0; > } > @@ -1287,7 +1290,6 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, > { > struct uvc_control_mapping *master_map = NULL; > struct uvc_control *master_ctrl = NULL; > - unsigned int i; > > memset(v4l2_ctrl, 0, sizeof(*v4l2_ctrl)); > v4l2_ctrl->id = mapping->id; > @@ -1330,21 +1332,6 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, > v4l2_ctrl->minimum = ffs(mapping->menu_mask) - 1; > v4l2_ctrl->maximum = fls(mapping->menu_mask) - 1; > v4l2_ctrl->step = 1; > - > - for (i = 0; BIT(i) <= mapping->menu_mask; ++i) { > - u32 menu_value; > - > - if (!test_bit(i, &mapping->menu_mask)) > - continue; > - > - menu_value = uvc_mapping_get_menu_value(mapping, i); > - > - if (menu_value == v4l2_ctrl->default_value) { > - v4l2_ctrl->default_value = i; > - break; > - } > - } > - > return 0; > > case V4L2_CTRL_TYPE_BOOLEAN: > @@ -1592,7 +1579,7 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain, > ctrl->handle = NULL; > > list_for_each_entry(mapping, &ctrl->info.mappings, list) { > - s32 value = __uvc_ctrl_get_value(mapping, data); > + s32 value = mapping->get(mapping, UVC_GET_CUR, data); > > /* > * handle may be NULL here if the device sends auto-update >