From nobody Thu Apr 2 21:33:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8B7DC6FA8E for ; Tue, 20 Sep 2022 14:12:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231487AbiITOMX (ORCPT ); Tue, 20 Sep 2022 10:12:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231604AbiITOLu (ORCPT ); Tue, 20 Sep 2022 10:11:50 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 524245A89E for ; Tue, 20 Sep 2022 07:10:17 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id b35so4117215edf.0 for ; Tue, 20 Sep 2022 07:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=EPUsq9ry6a/B8ysE7p/Gp0RizcV4HTBL3tocv0bMA9I=; b=D6YdCv4mIHMH6WUGhaC4ew992gGtns2XIA/d91zBkIBOhFOAApfyUVJ7u90gjTZLTI Rp96PSPU/6h2IeYAoU0gLDQNygbS1Yo3vhYsFFvd7GiY7OiAPwO2b/9xOsSoJvts15QW 3EIx+d7lXgAoPPknMH5EjIwPNQpbhdREjfc78= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=EPUsq9ry6a/B8ysE7p/Gp0RizcV4HTBL3tocv0bMA9I=; b=PVWWnlbQOrm8EI54atVOUiW9JnDisWusI0qCHLvI/pmovnkoCf5VhvDOwX444JP2VZ +dn5fConGznaWr/qRFAaRb7Fq5MBPDAiBEWQ1xjxrawtIbyCsN6wtCqdn/LPWA2rvHsR KWCILNBATleRCiknZx6DYni8vxnGKCZF0TQzycbt6+KCsfvCVydCKRlSOvirbm2k3xa4 +CvMb/BEEVt2Bj0N+8tN3T92V0qIiSuhr9JN0Ia7kGt5V3HJ1DX9FDrqKGkTVjq4EG+b knHS16hW9236KmgcFK4NmIphXchmi/6zqyam8ZPAkIzEmkwzxaJuDZLKMAeoyohNKd12 GtYQ== X-Gm-Message-State: ACrzQf0HHM3Y7tnQI4N6KaJfP8nprNk2ZwEcWfa/srEbYQhT3ju6ccBF rYsRyDIe/lU2GQXj6bzr6PscUPBgsWVtktP8QLs= X-Google-Smtp-Source: AMsMyM5wPtDcu8QXUO6uylKIX1BTWHWtLISuou3P2vKderFo8+B4PNZ+iozWx2NHn94BaeiRsgPV6A== X-Received: by 2002:a05:6402:50d3:b0:451:42e0:a0de with SMTP id h19-20020a05640250d300b0045142e0a0demr20892479edb.185.1663683003237; Tue, 20 Sep 2022 07:10:03 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id w11-20020a056402128b00b0044e796598bdsm115488edv.11.2022.09.20.07.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:10:02 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:09:50 +0200 Subject: [PATCH v1 1/3] media: uvcvideo: Only create input devs if hw supports it MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-powersave-v1-1-123aa2ba3836@chromium.org> References: <20220920-resend-powersave-v1-0-123aa2ba3836@chromium.org> In-Reply-To: <20220920-resend-powersave-v1-0-123aa2ba3836@chromium.org> To: Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, Tomasz Figa , Laurent Pinchart , Ricardo Ribalda , linux-media@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1336; i=ribalda@chromium.org; h=from:subject:message-id; bh=3NadNTBF4BvX9SA2sRowXe1SUqwds9fIYTSwvXBWhlY=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcmz5RRiV4EaA9t4Tc8kWTv6qO9FnISyOHjoftgI WP2JC8CJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJswAKCRDRN9E+zzrEiPm2D/ 9sCFizIFdBzPnHR+0raeehQ71UIHKmGBvoOLkJXkGnzDXKRvwp9b9FMak4ByuuHqViLH+zBFQLfoDF 2zMxpoL9jf4Spjm8kGWPzwlFqGqhXw8KddPg2TEGD7HGsgb+/PMKeyi5ek9KQSjTg3jzQhlMT6+FTw /KWeBB+3hFnJCvpKsBsA1QJA5zjhU3F95LWZDYeGSd58vrbYV7Vk3YikFGPlqlCmOpp15XjPTD41u2 P837hzTgA/6OY+bEHJh9zXJjVS0hQiNB5N59a/Usbq7cxfed/Vnb0dmfPddnPjHhh1unK/XyxEiEVI DgUyIce+OOi4bYi1u6TG1VunxT+/jeuOl7SFBjerJZ1KFHpqKhY1n3rpzunOqCrcNDz1GO3D/6i5ee i08PaX7it/STPZs0HQCiRboX0j9sTY4PjvX8liRH1VMiO2qCoHS6WZeRFjbkFxv61zGBiID6rUN2Fo woEo0Li4VvKf0SIfaMmYqWdYjxnX1TpxYNV9YVWJ5SmGE76jjT9voCdKDrkKFfhNyMSXff2d2o7MxL n0bd2Y4g2xJAL/gzWJ9tlY8LO8VulOkpmq3Y5f3QaS74S2rsm5jNfNed6G/mZDdbqnGsWAhqjGkt++ QmHxKLZrLN/Rtt/PZeIp3iqyVc/h50yb4QS6RQWI9vya8MwvDsvnJjJ6JGag== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Examine the stream headers to figure out if the device has a button and can be used as an input. Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc= _status.c index 7518ffce22ed..cb90aff344bc 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -18,11 +18,34 @@ * Input device */ #ifdef CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV + +static bool uvc_input_has_button(struct uvc_device *dev) +{ + struct uvc_streaming *stream; + + /* + * The device has button events if both bTriggerSupport and + * bTriggerUsage are one. Otherwise the camera button does not + * exist or is handled automatically by the camera without host + * driver or client application intervention. + */ + list_for_each_entry(stream, &dev->streams, list) { + if (stream->header.bTriggerSupport =3D=3D 1 && + stream->header.bTriggerUsage =3D=3D 1) + return true; + } + + return false; +} + static int uvc_input_init(struct uvc_device *dev) { struct input_dev *input; int ret; =20 + if (!uvc_input_has_button(dev)) + return 0; + input =3D input_allocate_device(); if (input =3D=3D NULL) return -ENOMEM; --=20 b4 0.11.0-dev-d93f8 From nobody Thu Apr 2 21:33:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99F13C54EE9 for ; Tue, 20 Sep 2022 14:12:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231279AbiITOMd (ORCPT ); Tue, 20 Sep 2022 10:12:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231571AbiITOLu (ORCPT ); Tue, 20 Sep 2022 10:11:50 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28A7561733 for ; Tue, 20 Sep 2022 07:10:18 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id y8so3999643edc.10 for ; Tue, 20 Sep 2022 07:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=otqXP3UDAqjwrNkT6tbklT3BOOMLMfKuSbWuAvIyB3Q=; b=TKweVFOpI9p8Vp6cWi7bgg8pot60gzt7WyOsIDFJBOKXjv/Dxi76vEV5vHkzFwy2G/ hLuxoIe8ZirS54WicUWmdKasZAmOpA7VuTZ7F3wNQYz96YFVQGns5d3fxNEmf7EuZ9jQ PUGIcJlCbdXxID8v/LQWwu3cViuIFsZr61MaE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=otqXP3UDAqjwrNkT6tbklT3BOOMLMfKuSbWuAvIyB3Q=; b=v94Q0cf9D+Z9qHFTbiO+eS1vlcmEn2ZwBLP2ma1tbtxptvE5pS9ImsR9Mx9UGBGKq6 mMk/bhmcBo+Op5MOmQvyDdP8z44XEqiQpNx/Rt0nLvZu3yRUZP0f7BtZbzgKuCnek+79 ViWHOlM5mml32BqaGADRvyttjJs0W8J/g6Ds6MZfh2higCS8e5NXyZstDIQIC/JTapkP DKjOFBCY8u0DhuwNlvxGa+c9t2D5Qb2L/HuUUrohvioZTpG+QGWvVC4Wte32RqjFKMyp aiA7V+SwD8gjv3Bdw7WJZzLC29YCs3heCNpmSMGG+NVaDLUBH1B/hv+o1UaY7FQuD6ff 6uEg== X-Gm-Message-State: ACrzQf0EbIWRlUMS1rXdhYLx3xCmywpvGViUc7jObDt6EdsnxQD+UnFF f2UY2UF02e7nXK35sAbWeHIN+3HHG4lmllIoe+c= X-Google-Smtp-Source: AMsMyM7/9So581DszjW7TI2lyf+LCAyaJaM52nLK0K9iZADI/LHlSWWt8mKmZvlo8xCP+Iu3whr24A== X-Received: by 2002:a05:6402:298d:b0:451:5fc5:d423 with SMTP id eq13-20020a056402298d00b004515fc5d423mr20086554edb.102.1663683004230; Tue, 20 Sep 2022 07:10:04 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id w11-20020a056402128b00b0044e796598bdsm115488edv.11.2022.09.20.07.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:10:03 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:09:51 +0200 Subject: [PATCH v1 2/3] media: uvcvideo: Refactor streamon/streamoff MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-powersave-v1-2-123aa2ba3836@chromium.org> References: <20220920-resend-powersave-v1-0-123aa2ba3836@chromium.org> In-Reply-To: <20220920-resend-powersave-v1-0-123aa2ba3836@chromium.org> To: Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, Tomasz Figa , Laurent Pinchart , Ricardo Ribalda , linux-media@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1977; i=ribalda@chromium.org; h=from:subject:message-id; bh=UulBAVr6hwSvCunfG42JRX4U7c6yd+7PeOGh82DVhYA=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcm1f3I0JQPFAaDRAu32YgWda+JXBaESB3kn+i5K Fl280rqJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJtQAKCRDRN9E+zzrEiIikEA CcqM30IqIshzzupb/gzLBEe8bV5HX1JYiWHwQ65tPSYrweN2UVoKqaf/xjlRrvPqvjS3xgU1autuHb 9kGaWj1A422CNNvfsHGNJv/KAvdq8Hs4lqZVagMOUvcq3qH71zqb7AL8iZ9I6B+/mbzo0sPQhzPMLJ S+NE+lGguNa+bQge1C5sMPyHGF6Lrs1vGJARkkh/KllZVptUNCHqd6A5eLOVpxuFAabUkwDvkCTeuA lkOE7QHmTugDrB8Ht79T0lr60ztlEsDPmqaSIaOnQMXRGS+t++7WJhmHvAFwK/7IE0+1vKdsWcaPHA 4inVOMbLjxECNxVMHP3X2PPYU83sDepicCabL7+oQqqfdgP5uirEeYWFtxfCMcs4eFMWS5mDhpnT4q sDuCwJn+FHJ7wm/zOGnnYesQWo7pfDmMiBMFfGoKv02PdKpMG2dofSireqhQlBlOLj0rKZKpiPkQ4D e8Iza9wNrRC8rwBYc/D5qQ8Ba4dGqkW5Aj09fqaBWneRiHX97Yr5kZF7Hn/zBhYkdEHZ2WqVuvwviK BEuwzLaq4CKvFmZaSvd3MXaM2QSM7Dzq/ffRfUkifKmvUMBU2Ng8YuG2CQIyWPlyXfoYD4/7BRG2Sp mmo2f38YAzzStrHHIcptB0OuDtng2P/iqTUXCMDptwDz4LcXccvC6DSQxu+A== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new variable to handle the streaming state and handle the streamoff errors, that were not handled before. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index 4cc3fa6b8c98..8d5002543e2c 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -840,13 +840,19 @@ static int uvc_ioctl_streamon(struct file *file, void= *fh, { struct uvc_fh *handle =3D fh; struct uvc_streaming *stream =3D handle->stream; - int ret; + int ret =3D -EBUSY; =20 if (!uvc_has_privileges(handle)) return -EBUSY; =20 mutex_lock(&stream->mutex); + + if (handle->is_streaming) + goto unlock; ret =3D uvc_queue_streamon(&stream->queue, type); + handle->is_streaming =3D !ret; + +unlock: mutex_unlock(&stream->mutex); =20 return ret; @@ -857,15 +863,22 @@ static int uvc_ioctl_streamoff(struct file *file, voi= d *fh, { struct uvc_fh *handle =3D fh; struct uvc_streaming *stream =3D handle->stream; + int ret =3D 0; =20 if (!uvc_has_privileges(handle)) return -EBUSY; =20 mutex_lock(&stream->mutex); - uvc_queue_streamoff(&stream->queue, type); + + if (!handle->is_streaming) + goto unlock; + ret =3D uvc_queue_streamoff(&stream->queue, type); + handle->is_streaming =3D !!ret; + +unlock: mutex_unlock(&stream->mutex); =20 - return 0; + return ret; } =20 static int uvc_ioctl_enum_input(struct file *file, void *fh, diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 24c911aeebce..caf74c87aaf1 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -725,6 +725,7 @@ enum uvc_handle_state { =20 struct uvc_fh { struct v4l2_fh vfh; + bool is_streaming; struct uvc_video_chain *chain; struct uvc_streaming *stream; enum uvc_handle_state state; --=20 b4 0.11.0-dev-d93f8 From nobody Thu Apr 2 21:33:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0956ECAAD8 for ; Tue, 20 Sep 2022 14:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231479AbiITOM3 (ORCPT ); Tue, 20 Sep 2022 10:12:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231649AbiITOLw (ORCPT ); Tue, 20 Sep 2022 10:11:52 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB16B61B01 for ; Tue, 20 Sep 2022 07:10:19 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id e17so4029101edc.5 for ; Tue, 20 Sep 2022 07:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=ucPdrtJkPwf0BboNbtvdco9R/hcnAGguJpObhkf38C8=; b=HO5sr1cWLwa3y35YNEdTI16wyVUtMIACshxUIA4KWnbNs3UCm98hSB4OHTprMEwC/a T8LpJmaajKMQiwbza8YSKHfEnyK9uF7Y6dWfRWhnE+BDtPJAzNdUGCBQr4KkiG+XQf+Y P1IQdSd10CLIj2Iw85QCEoe+CFAkCWf5GjREY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=ucPdrtJkPwf0BboNbtvdco9R/hcnAGguJpObhkf38C8=; b=sB1cBlmceXZx73bX/Uu248/WetpqWehJbeYXYdpfB+4kSHgaWjdmT1atAh8zZvXdou 1pIT4m++p2ZBnZaX7c2TuCK2l0inEdz0cAmUbwNkexPeSP1DCjoG0SmC52yQ8BYn9zpq lM2bWq4uxaTmkiNMD0112JPRC1pAKP4WdSWaG49s5DErnslQS/i9HXWMVHn3m9baRBf0 v40phvHuwGvkp9ySgjENZZHo1jP2WlGJ3tKoPiPd/+VV/gl+R58gj9/2oBh1NdzQhuwv B7NQ1ViMo8SyIirxZ33V3rdck0JLQSRI1phvfFaLNvAJJ59Krf1c1PFoTzPkyr0Q0P6S vVQQ== X-Gm-Message-State: ACrzQf3EFrkwJ+Ahoj+1r5BZPRHVHoWTo8vvsRxoV+Ljp+OsKUtk+Jrm rVvC7eA3Asx817REXiAjSQQZCuFrOJK/k5qsXBA= X-Google-Smtp-Source: AMsMyM4lxDO7g4HuMho4z6sf2P/lecptqkY7Q12fxuVeWwVVMeeySCymELdzq/VUaWzsQwXg81GsMw== X-Received: by 2002:a05:6402:26d2:b0:451:5a8c:346b with SMTP id x18-20020a05640226d200b004515a8c346bmr19975208edd.424.1663683005196; Tue, 20 Sep 2022 07:10:05 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id w11-20020a056402128b00b0044e796598bdsm115488edv.11.2022.09.20.07.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:10:04 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:09:52 +0200 Subject: [PATCH v1 3/3] media: uvcvideo: Do power management granularly MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-powersave-v1-3-123aa2ba3836@chromium.org> References: <20220920-resend-powersave-v1-0-123aa2ba3836@chromium.org> In-Reply-To: <20220920-resend-powersave-v1-0-123aa2ba3836@chromium.org> To: Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, Tomasz Figa , Laurent Pinchart , Ricardo Ribalda , linux-media@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=10244; i=ribalda@chromium.org; h=from:subject:message-id; bh=mQK7QNORiDfMtgiTEcpPSa/3OoMx5fx8L+y3jCnHq5c=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcm4Y0ax3mHrs1uEOk3ppGkwa6bxcvCk1VY/vljo 6dcksceJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJuAAKCRDRN9E+zzrEiD93D/ 9CkA+JO7fksIwxy/Ssk6nrHJm1sVDO7SuMdyFr1TYCxeCYqIcCgdfTqtYbB0vNllSJcXh1GUMbR1c4 U51czGB1995pULG+dE7hnr5o1VDsBOCpSlKjeS0hpOAaQywgQH9qpJ3Dpr5sWbXh7Z+CqFWt9JL6B8 cKkIBnu0ZHJpgSptU0Nge/VsJDSnYZARZglarzCdrh/MnxKiwSuDYo02TwNQU5k36N8tsOgQ0CrDj3 rLR1oqSn2osS+d5kg2MGZVc8/XvjjE11ESov7E1MdVo/TI+6p+YjvEBDzEpL1Ro1vW+nZa+1IqvUXt LMVDDv8OcN7JFgCTbPMACETlNQIVbjZX4g6YGvVg0FUJdlBK0/F/DvFxyunzOay8HYIp0iIk/TOGdh FntTnv3e+lRrRukkIw+9GgxDoHwy7t4PIijOa48GMLaTJdfSsSu2chu0twMhWabPb1BoyPXngWltYn 6tyPxp8DurOTeVlaCqGG6tC3q6T76rdQrqTC0L1ZMdsrhO4uWy3k8KRZwYPTyjVDDyOAznAH/kH5e3 kS6hCHMLaOYgzFXUdXQlhGz6z/1WtJufAZgEACJ5XgvNfllbVr/fT+EJNXIDzZuhdLAghEreGonYNu KxtCNyIvnSPWCIzXccL7oSeF+nJPrEm7P3q+5QH2MVVu9g811uoXBaKlGLAA== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of suspending/resume the USB device at open()/close(), do it when the device is actually used. This way we can reduce the power consumption when a service is holding the video device and leaving it in an idle state. Reviewed-by: Tomasz Figa Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index 8d5002543e2c..b9642afabd9b 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -25,6 +25,46 @@ =20 #include "uvcvideo.h" =20 +/* ------------------------------------------------------------------------ + * UVC power management + */ + +static int uvc_pm_get(struct uvc_streaming *stream) +{ + int ret =3D 0; + + ret =3D usb_autopm_get_interface(stream->dev->intf); + if (ret) + return ret; + + mutex_lock(&stream->dev->lock); + if (!stream->dev->users) + ret =3D uvc_status_start(stream->dev, GFP_KERNEL); + if (!ret) + stream->dev->users++; + mutex_unlock(&stream->dev->lock); + + if (ret) + usb_autopm_put_interface(stream->dev->intf); + + return ret; +} + +static void uvc_pm_put(struct uvc_streaming *stream) +{ + mutex_lock(&stream->dev->lock); + if (WARN_ON(!stream->dev->users)) { + mutex_unlock(&stream->dev->lock); + return; + } + stream->dev->users--; + if (!stream->dev->users) + uvc_status_stop(stream->dev); + mutex_unlock(&stream->dev->lock); + + usb_autopm_put_interface(stream->dev->intf); +} + /* ------------------------------------------------------------------------ * UVC ioctls */ @@ -249,6 +289,9 @@ static int uvc_v4l2_try_format(struct uvc_streaming *st= ream, * developers test their webcams with the Linux driver as well as with * the Windows driver). */ + ret =3D uvc_pm_get(stream); + if (ret) + return ret; mutex_lock(&stream->mutex); if (stream->dev->quirks & UVC_QUIRK_PROBE_EXTRAFIELDS) probe->dwMaxVideoFrameSize =3D @@ -257,6 +300,7 @@ static int uvc_v4l2_try_format(struct uvc_streaming *st= ream, /* Probe the device. */ ret =3D uvc_probe_video(stream, probe); mutex_unlock(&stream->mutex); + uvc_pm_put(stream); if (ret < 0) return ret; =20 @@ -468,7 +512,13 @@ static int uvc_v4l2_set_streamparm(struct uvc_streamin= g *stream, } =20 /* Probe the device with the new settings. */ + ret =3D uvc_pm_get(stream); + if (ret) { + mutex_unlock(&stream->mutex); + return ret; + } ret =3D uvc_probe_video(stream, &probe); + uvc_pm_put(stream); if (ret < 0) { mutex_unlock(&stream->mutex); return ret; @@ -559,36 +609,29 @@ static int uvc_v4l2_open(struct file *file) { struct uvc_streaming *stream; struct uvc_fh *handle; - int ret =3D 0; =20 stream =3D video_drvdata(file); uvc_dbg(stream->dev, CALLS, "%s\n", __func__); =20 - ret =3D usb_autopm_get_interface(stream->dev->intf); - if (ret < 0) - return ret; - /* Create the device handle. */ handle =3D kzalloc(sizeof(*handle), GFP_KERNEL); - if (handle =3D=3D NULL) { - usb_autopm_put_interface(stream->dev->intf); + if (!handle) return -ENOMEM; - } =20 - mutex_lock(&stream->dev->lock); - if (stream->dev->users =3D=3D 0) { - ret =3D uvc_status_start(stream->dev, GFP_KERNEL); - if (ret < 0) { - mutex_unlock(&stream->dev->lock); - usb_autopm_put_interface(stream->dev->intf); + /* + * If the uvc evdev exists we cannot suspend when the device + * is idle. Otherwise we will miss button actions. + */ + if (stream->dev->input) { + int ret; + + ret =3D uvc_pm_get(stream); + if (ret) { kfree(handle); return ret; } } =20 - stream->dev->users++; - mutex_unlock(&stream->dev->lock); - v4l2_fh_init(&handle->vfh, &stream->vdev); v4l2_fh_add(&handle->vfh); handle->chain =3D stream->chain; @@ -610,6 +653,12 @@ static int uvc_v4l2_release(struct file *file) if (uvc_has_privileges(handle)) uvc_queue_release(&stream->queue); =20 + if (handle->is_streaming) + uvc_pm_put(stream); + + if (stream->dev->input) + uvc_pm_put(stream); + /* Release the file handle. */ uvc_dismiss_privileges(handle); v4l2_fh_del(&handle->vfh); @@ -617,12 +666,6 @@ static int uvc_v4l2_release(struct file *file) kfree(handle); file->private_data =3D NULL; =20 - mutex_lock(&stream->dev->lock); - if (--stream->dev->users =3D=3D 0) - uvc_status_stop(stream->dev); - mutex_unlock(&stream->dev->lock); - - usb_autopm_put_interface(stream->dev->intf); return 0; } =20 @@ -849,9 +892,17 @@ static int uvc_ioctl_streamon(struct file *file, void = *fh, =20 if (handle->is_streaming) goto unlock; + + ret =3D uvc_pm_get(stream); + if (ret) + goto unlock; + ret =3D uvc_queue_streamon(&stream->queue, type); handle->is_streaming =3D !ret; =20 + if (!handle->is_streaming) + uvc_pm_put(stream); + unlock: mutex_unlock(&stream->mutex); =20 @@ -875,6 +926,9 @@ static int uvc_ioctl_streamoff(struct file *file, void = *fh, ret =3D uvc_queue_streamoff(&stream->queue, type); handle->is_streaming =3D !!ret; =20 + if (!handle->is_streaming) + uvc_pm_put(stream); + unlock: mutex_unlock(&stream->mutex); =20 @@ -928,6 +982,7 @@ static int uvc_ioctl_g_input(struct file *file, void *f= h, unsigned int *input) { struct uvc_fh *handle =3D fh; struct uvc_video_chain *chain =3D handle->chain; + struct uvc_streaming *stream =3D handle->stream; u8 *buf; int ret; =20 @@ -941,9 +996,16 @@ static int uvc_ioctl_g_input(struct file *file, void *= fh, unsigned int *input) if (!buf) return -ENOMEM; =20 + ret =3D uvc_pm_get(stream); + if (ret) { + kfree(buf); + return ret; + } + ret =3D uvc_query_ctrl(chain->dev, UVC_GET_CUR, chain->selector->id, chain->dev->intfnum, UVC_SU_INPUT_SELECT_CONTROL, buf, 1); + uvc_pm_put(stream); if (!ret) *input =3D *buf - 1; =20 @@ -956,6 +1018,7 @@ static int uvc_ioctl_s_input(struct file *file, void *= fh, unsigned int input) { struct uvc_fh *handle =3D fh; struct uvc_video_chain *chain =3D handle->chain; + struct uvc_streaming *stream =3D handle->stream; u8 *buf; int ret; =20 @@ -977,10 +1040,17 @@ static int uvc_ioctl_s_input(struct file *file, void= *fh, unsigned int input) if (!buf) return -ENOMEM; =20 + ret =3D uvc_pm_get(stream); + if (ret) { + kfree(buf); + return ret; + } + *buf =3D input + 1; ret =3D uvc_query_ctrl(chain->dev, UVC_SET_CUR, chain->selector->id, chain->dev->intfnum, UVC_SU_INPUT_SELECT_CONTROL, buf, 1); + uvc_pm_put(stream); kfree(buf); =20 return ret; @@ -991,8 +1061,15 @@ static int uvc_ioctl_queryctrl(struct file *file, voi= d *fh, { struct uvc_fh *handle =3D fh; struct uvc_video_chain *chain =3D handle->chain; + struct uvc_streaming *stream =3D handle->stream; + int ret; =20 - return uvc_query_v4l2_ctrl(chain, qc); + ret =3D uvc_pm_get(stream); + if (ret) + return ret; + ret =3D uvc_query_v4l2_ctrl(chain, qc); + uvc_pm_put(stream); + return ret; } =20 static int uvc_ioctl_query_ext_ctrl(struct file *file, void *fh, @@ -1000,10 +1077,15 @@ static int uvc_ioctl_query_ext_ctrl(struct file *fi= le, void *fh, { struct uvc_fh *handle =3D fh; struct uvc_video_chain *chain =3D handle->chain; + struct uvc_streaming *stream =3D handle->stream; struct v4l2_queryctrl qc =3D { qec->id }; int ret; =20 + ret =3D uvc_pm_get(stream); + if (ret) + return ret; ret =3D uvc_query_v4l2_ctrl(chain, &qc); + uvc_pm_put(stream); if (ret) return ret; =20 @@ -1049,6 +1131,7 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, v= oid *fh, { struct uvc_fh *handle =3D fh; struct uvc_video_chain *chain =3D handle->chain; + struct uvc_streaming *stream =3D handle->stream; struct v4l2_ext_control *ctrl =3D ctrls->controls; unsigned int i; int ret; @@ -1073,22 +1156,30 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file,= void *fh, return 0; } =20 + ret =3D uvc_pm_get(stream); + if (ret) + return ret; ret =3D uvc_ctrl_begin(chain); - if (ret < 0) + if (ret < 0) { + uvc_pm_put(stream); return ret; + } =20 for (i =3D 0; i < ctrls->count; ++ctrl, ++i) { ret =3D uvc_ctrl_get(chain, ctrl); if (ret < 0) { uvc_ctrl_rollback(handle); ctrls->error_idx =3D i; - return ret; + goto done; } } =20 ctrls->error_idx =3D 0; =20 - return uvc_ctrl_rollback(handle); + ret =3D uvc_ctrl_rollback(handle); +done: + uvc_pm_put(stream); + return ret; } =20 static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *handle, @@ -1097,6 +1188,7 @@ static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *h= andle, { struct v4l2_ext_control *ctrl =3D ctrls->controls; struct uvc_video_chain *chain =3D handle->chain; + struct uvc_streaming *stream =3D handle->stream; unsigned int i; int ret; =20 @@ -1104,9 +1196,15 @@ static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *= handle, if (ret < 0) return ret; =20 + ret =3D uvc_pm_get(stream); + if (ret) + return ret; + ret =3D uvc_ctrl_begin(chain); - if (ret < 0) + if (ret < 0) { + uvc_pm_put(stream); return ret; + } =20 for (i =3D 0; i < ctrls->count; ++ctrl, ++i) { ret =3D uvc_ctrl_set(handle, ctrl); @@ -1114,16 +1212,20 @@ static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh = *handle, uvc_ctrl_rollback(handle); ctrls->error_idx =3D ioctl =3D=3D VIDIOC_S_EXT_CTRLS ? ctrls->count : i; - return ret; + goto done; } } =20 ctrls->error_idx =3D 0; =20 if (ioctl =3D=3D VIDIOC_S_EXT_CTRLS) - return uvc_ctrl_commit(handle, ctrls); + ret =3D uvc_ctrl_commit(handle, ctrls); else - return uvc_ctrl_rollback(handle); + ret =3D uvc_ctrl_rollback(handle); + +done: + uvc_pm_put(stream); + return ret; } =20 static int uvc_ioctl_s_ext_ctrls(struct file *file, void *fh, @@ -1147,8 +1249,16 @@ static int uvc_ioctl_querymenu(struct file *file, vo= id *fh, { struct uvc_fh *handle =3D fh; struct uvc_video_chain *chain =3D handle->chain; + struct uvc_streaming *stream =3D handle->stream; + int ret; + + ret =3D uvc_pm_get(stream); + if (ret) + return ret; + ret =3D uvc_query_v4l2_menu(chain, qm); + uvc_pm_put(stream); =20 - return uvc_query_v4l2_menu(chain, qm); + return ret; } =20 static int uvc_ioctl_g_selection(struct file *file, void *fh, --=20 b4 0.11.0-dev-d93f8