From patchwork Thu Feb 6 19:47:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 862818 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 DFF8D1ACED5 for ; Thu, 6 Feb 2025 19:47:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738871226; cv=none; b=MITUaD9pq3eGthQ0RQY8jGhmVMLF/6uygItAk9qI/YYJbeSynP9wCnjToA9asFeBNO9/KMWUiAX6K0AOGmA0QuWIMns2K9HwmWIuRWxYPUrrgsl3sCiyupHZUjQMFCc0+Jfsa4RMC19XfsZkgH8dsyCg/fDRW2WtNTyzrRopY7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738871226; c=relaxed/simple; bh=XTNSgJrJEclgdePfJNToDJor8F5x8uBa0UDEkcTlIIQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NLjTXkuWkC76kiIwDtAUaTjKyo4pfoStALKwJ4S+TTg/6PVYKwAa9hmdY5dahYmfHRLfnbb1wtPmvujoAUUcUC687QZ1A4W0jX+IYo4HCdvesTJRF8YxOcodzi+auOt5Ka7pJuPf8S/tAYMUZY6KBpU/YUTUyfDfwKY/yyQ2SxU= 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=h9SeFq1g; arc=none smtp.client-ip=209.85.219.44 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="h9SeFq1g" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6e43c9c8d08so9326096d6.3 for ; Thu, 06 Feb 2025 11:47:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738871223; x=1739476023; 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=igtmC9jgV1/HQ1d7Wdm7uxza0ZAAjdzHDVgS49iXFC4=; b=h9SeFq1gVmoO0GQdADjV/pVVlR1fiaJUvsL4/RZb8t0sZTgHkzc6e2/54x0I0HOXDu eEDu2oaM453ih79M1zQnoqDJNUJ0ZFbRqpGps7yhm4XucNL5U6qyguH1a8dN133swp/m 0dm7xyseg0gjMBCcuaJ4kqYeXAMXFZVtXuFnk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738871223; x=1739476023; 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=igtmC9jgV1/HQ1d7Wdm7uxza0ZAAjdzHDVgS49iXFC4=; b=sXiFdPJYPyNcGmnueZEqb8LXkoXLBDzbRILSFvJeZ88rdxqeP82as7kIwH0/laY0gM FIxe3HTYRyAt2QTbIQON2aNbbPjqTgueUEMjnq456fjl8BLUywnynoDSYNp54Uee2Mud 7iw/36PFs6oDkUWXv5JwonfEuancYVuYusBfqXlp+wS7EsHJYbirFgucsR+wRLAhkq2v ag+iKGkcKs1SAAp+sSEtHWkcKnRgAziyuZHPxE8cqH8wyhiiGkHY/Owj1wgi26Elz72s oruZ+rL0Bje72fqpHN6CDw2SpPxB3p2X1GBovboTJ4cG/DPvxr59xkyxXdIuS60s1d7x pvQw== X-Gm-Message-State: AOJu0Yx6AInwtyiOvZZFW2bXE4iK/2mJfFttHKvSPu2XMR3zyw2b/zeQ L5UGNWbxl3AURxM3ER3FS+//XUzFYBkq5O7AJMtGB7LtuJ33cOBG+lngsgdGPw== X-Gm-Gg: ASbGncsLIXez8nWUYE09wrVQCf5iZPql2UPoEcMCwgiFyyJW25BDw5e/KxzxGnRzVog VaTdS8986hmv9Pxs9BRVQZHsz1S0rYRtuXN7v+xJkt2zAU+UWl52E8K7KuPfQXFsbaohhcbzy4G KNNR/Cp1SltEPf/fIT3kNwot2XLQQbuX3IU/ddDhqXqrpuQxDCgiDdAcZei612L4eZTYdIId0lH bHY3ceVMJPLL66GB721ttrHm1i5sejzWhv/zGF5xYp5sxtPihPg/A7pponipvL9Soml1vF5+vPy EsLkJ0QjcfBOkigTyq8OPCVLkcyKKZNbgcTha2l5ZL0zpJoSPqyeIhx+8ym+D5ypOw== X-Google-Smtp-Source: AGHT+IF6vyM30lmo4rLzFxc67TuSAmLMTXYr8s3jpkk4a0HE4QMK03rygp5IAu9Su7eRIqG5HefLFQ== X-Received: by 2002:a05:6214:f61:b0:6dd:84b7:dd86 with SMTP id 6a1803df08f44-6e4456eb684mr4186876d6.36.1738871222740; Thu, 06 Feb 2025 11:47:02 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e43bacb6c5sm8756386d6.102.2025.02.06.11.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 11:47:02 -0800 (PST) From: Ricardo Ribalda Date: Thu, 06 Feb 2025 19:47:00 +0000 Subject: [PATCH v3 1/6] media: uvcvideo: Keep streaming state in the file handle Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-uvc-granpower-ng-v3-1-32d0d7b0c5d8@chromium.org> References: <20250206-uvc-granpower-ng-v3-0-32d0d7b0c5d8@chromium.org> In-Reply-To: <20250206-uvc-granpower-ng-v3-0-32d0d7b0c5d8@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Ricardo Ribalda X-Mailer: b4 0.13.0 Add a variable in the file handle state to figure out if a camera is in the streaming state or not. This variable will be used in the future for power management policies. Now that we are at it, make use of guards to simplify the code. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_v4l2.c | 15 +++++++++++---- drivers/media/usb/uvc/uvcvideo.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 93c6cdb23881..856eaa23e703 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -835,11 +835,17 @@ static int uvc_ioctl_streamon(struct file *file, void *fh, if (!uvc_has_privileges(handle)) return -EBUSY; - mutex_lock(&stream->mutex); + guard(mutex)(&stream->mutex); + + if (handle->is_streaming) + return 0; + ret = uvc_queue_streamon(&stream->queue, type); - mutex_unlock(&stream->mutex); + if (!ret) + handle->is_streaming = true; return ret; + } static int uvc_ioctl_streamoff(struct file *file, void *fh, @@ -851,9 +857,10 @@ static int uvc_ioctl_streamoff(struct file *file, void *fh, if (!uvc_has_privileges(handle)) return -EBUSY; - mutex_lock(&stream->mutex); + guard(mutex)(&stream->mutex); + uvc_queue_streamoff(&stream->queue, type); - mutex_unlock(&stream->mutex); + handle->is_streaming = false; return 0; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 5e388f05f3fc..bc87e1f2c669 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -618,6 +618,7 @@ struct uvc_fh { struct uvc_streaming *stream; enum uvc_handle_state state; unsigned int pending_async_ctrls; + bool is_streaming; }; struct uvc_driver { From patchwork Thu Feb 6 19:47:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 862817 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (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 2D1921B041A for ; Thu, 6 Feb 2025 19:47:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738871227; cv=none; b=S/3ZzxhzsXxLkRXx2ZDiqnKFBJTekdsKcLIhyfDKNmeUb1MSOONApStL4tfWeF6JaXPxsTBoUAzm+SNuhLMEnuROfsRmtdv1KJFNKMAaDYFO9fXU1yKdDt9RuG56ihi0Lfe/dhlJlKux1I1RrQbJUdnacUJhFCcenOE287wpEVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738871227; c=relaxed/simple; bh=jJOOAqwCsQWSNDiDPF3S2JW8j13hrUZylnSpIecS95c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SYkZO9iI3rBgAOyqe+ohBW/jzHqj1xofVr7Lm9o9KntJ4WlmN0Y3rpVkZfO379zA/IVOWAzYZrtIA0puQM7pGjd4gd9elv9fFRDQVgkdvG8L4rsBn//dSQNppfitoH8Z7SNUVmYZg0t+4CzvrNEbTius4VC1rTmThOSk/aq7+ng= 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=aoMDqbYr; arc=none smtp.client-ip=209.85.219.48 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="aoMDqbYr" Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6e41e18137bso12050426d6.1 for ; Thu, 06 Feb 2025 11:47:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738871225; x=1739476025; 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=pJ2UjanTBYGPlNg/34ayATbdI98nJQKJ+7M5AzyqOzs=; b=aoMDqbYrxISZtXgIwZND+pzZNBmFFxTU6yUXLxCFs5l/2EDOF0r5qM8zUATyqWk/Zm atgIU3kVB5d9SF3vrasT5d5bhFKmv1V7NaitFVcndw63KUI7ps/VT9RwYq66ijEUtrrg LPrKhfSjKHxcgP1BEAIssxCNPa9B4PurteuME= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738871225; x=1739476025; 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=pJ2UjanTBYGPlNg/34ayATbdI98nJQKJ+7M5AzyqOzs=; b=SzsBYB+674WMgihZr/QZKfkPyZ7i2HVXi/m5SOXKmJGLC9qvW3LfVG83Mjc7JD6PG1 mnKrSulMaKAXxC6ieFgz//8UsAm1hImPnOAVk6XVvUD847J+5G5LWlm3ZHmyEvlhsf9O 4fQdYkvE9TJWqJDGrQTmoQ0LU0VE7wJyxifoC3OF4+HpuOSpk7tNsGzwKUjGy5ncc7gX CaFW1RtldSkpDVq7OTpVWpMPU/MfLMQOv2irSL4pPfcGSWhhGNmBQyA2gEeOCnqo029M T0OZZ7BgqfYXftnMtHCP7IZve3Lk7DYHgVqeM23Pa/DL6FfwWDg+yoWvonzRhwOoqBUK 6x7g== X-Gm-Message-State: AOJu0YzF1J+1JGp19usVqORDrE9mOvDJKFu11zU38+49FAo/TKdIqvEy pzmR/qzfFmyX3RuZcB/WmQQ2OgHEJAyIyrkMV+9xkJhn04fnpwhZYCLKwJ8waQ== X-Gm-Gg: ASbGncvJpu3srL/TtKaLh2IqEKMS73ql1Dys+he6UXvX2qPCtyEvoogFcOLDLgnRWcN iSLL1yulKGJAGxnZ3jZ+t4lIk3eONQnyqGVK8kQyB3sZhyhqs7wR4+QRONNXk2pPg3T3m+MYmHv QHGZsTVMyTJ8Co1dk74McbP/6DfPZn6428U8bGLvE5s/4ur/HHzHtGAaTG+I0BUfhMs0wEABkX1 DOFtn7Yhlm7oo9ZRlnXwNx1dSiMcpjD3I77d2Ut078AnGlzKHUKV8PmH4WUlUNh7FvjLpfXVmgV dVzmXZiAfcq3wUUmj+azD3biQBuj6+Dxkq/nNcykg6iiIpGImArMEybVivli+cjxuA== X-Google-Smtp-Source: AGHT+IFrT6xp6LSUuyg83VdMkSCUqUcLFurxtgJTgy1C4tSJldA04ZFL4Re8s9woc36U2BXKqvrHng== X-Received: by 2002:ad4:576b:0:b0:6e1:afcf:8710 with SMTP id 6a1803df08f44-6e4455c2033mr4894416d6.8.1738871224972; Thu, 06 Feb 2025 11:47:04 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e43bacb6c5sm8756386d6.102.2025.02.06.11.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 11:47:03 -0800 (PST) From: Ricardo Ribalda Date: Thu, 06 Feb 2025 19:47:02 +0000 Subject: [PATCH v3 3/6] media: uvcvideo: Add a uvc_status guard Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-uvc-granpower-ng-v3-3-32d0d7b0c5d8@chromium.org> References: <20250206-uvc-granpower-ng-v3-0-32d0d7b0c5d8@chromium.org> In-Reply-To: <20250206-uvc-granpower-ng-v3-0-32d0d7b0c5d8@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Ricardo Ribalda X-Mailer: b4 0.13.0 It helps will help will the error handling of PM functions. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvcvideo.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index bc87e1f2c669..be0817da538c 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -763,6 +763,8 @@ void uvc_status_suspend(struct uvc_device *dev); int uvc_status_get(struct uvc_device *dev); void uvc_status_put(struct uvc_device *dev); +DEFINE_GUARD(uvc_status, struct uvc_device *, uvc_status_get(_T), uvc_status_put(_T)) + /* Controls */ extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops; From patchwork Thu Feb 6 19:47: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: 862816 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (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 2A1541CD1E4 for ; Thu, 6 Feb 2025 19:47:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738871230; cv=none; b=ocrqYQzn4la6WPEZZbzxrv/tvhKD41lu7huMwSdfwwXokTeovgZwS2I6r1Bnrsgg+igHahSoSipD/MpWMtqfyttWj9DgeTVhKsEgD7dlTkInbo640By0UYC6VM0L6y9w8TbN/ooZe/PrOBJ0wQiZIY/f34bzunoblmpLZJ0UOXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738871230; c=relaxed/simple; bh=b6os191LBubYA+XTSlaDJR6i3p2+873ZDu4lZh/isJ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iZp56hbaGrNgT664Lc+IDs+tcL7ACZJPb/8xMgWl6QE+izC9hSkTHVPqRPg3asuBUpcn3Nov19FU8ll4KK1rF8pbOnG0Jdg8GCC5bZp8uzwW45kyIcn69yKwM6YLRbLUs3sg/Y1KB2JlU2/RX05Ahse+5I6hjtaa5F91orRaWbQ= 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=SvwUzSVi; arc=none smtp.client-ip=209.85.219.52 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="SvwUzSVi" Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6e17d3e92d9so10402166d6.1 for ; Thu, 06 Feb 2025 11:47:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738871227; x=1739476027; 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=IX4faMlfOGXjEO5q+yF1g5VR45MAApZ98krsq1hjZdk=; b=SvwUzSVi9OOrFD8ASezwtJxWcRkkTjeSfQeqJNJdLUjGTuNpVAN6qGB2jbV8Dna0Ce hpS0ZYnFmVzVbObgPfIikr/T5Ljk/YcW3gZG/j8IHGMIW0gmrYgh7Rm6pyP+Tzp5HEvv LOVypmADi/oqYuF8AOzPewxHbgKeuEDEw+21k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738871227; x=1739476027; 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=IX4faMlfOGXjEO5q+yF1g5VR45MAApZ98krsq1hjZdk=; b=LSdoZCUIUc/1PgZKGxBDWOnuIcBFJwIwXG5HVlqnsy2W8rlM8vU57rYpfuVfFh52WP Cu83Cv6cfB1Lea9FAS3keIzw3/EP0c3nuuGJg0L1q30PMm2Y1nqAz94oso5cQDABXgub KAyFRNACtofcTyMu5MUFIxSstqWWu2TdSVltZPSQPjQyAMM9X09+Wet4KB48eAIfvaJG IvYIEhnQLOb7TMQYRFZ+gKrrVXq+W07MA2kWby18tx/SWNKKD1IaV7nrIUdvSNWeNsi1 fe9txn4POqcGJqiVN/J2KtyHQwLT/H0guok/dPUGuna3pSt1yQKRLAcztRxDdj/BeeQp bURQ== X-Gm-Message-State: AOJu0YwaVPcZJB9HsqLcCNTNQ6rEY7Yo1p1+Jpy826fUV14OYL6N6jVL MP0jkGEdJZ2qHmWMtyCXyzS8gGHW3pQzZ1iKCptuG/tB5wQs5wjOjyCGgMKHVw== X-Gm-Gg: ASbGncs2SU51VreS6quhRdJ3KygMxeMsjjFqbJNzZu1joSqkg/XiiYzftaSI/hGv7Bg dfr7v4OLLKwffPfutcWaYVBxQcaYi3q3ng+DJowMtST6Xl/SojN5kr7rZLNHYbcaYsWDQ3fE3Xo BhMcB40Cezw4P6cDtQwVoQUYW17GV9sguPoHAZfuRE90ZMnqzQPoibNZPCqySP74esu53n5qALo 9J+1P184AlfzqKIBvcdF5COuDzABv7R5l0gDCvWla4djsUI6dgzGUBbgLo8Gu6onqD49YIJpPTF CXsw+ygISSDWu1VBSRlSn43mtvDpp0LO/JyGqUw5TyF4uRCAuMEhX9hvSH86S8hcAQ== X-Google-Smtp-Source: AGHT+IGy2/g0qdhkiz8O8OjgTmImN4zombJKSC4UxkJ6rl2bvNoupS5Zcrv6gbGUmsK4Jw1vqNhKhg== X-Received: by 2002:a05:6214:2423:b0:6e2:481b:7cd9 with SMTP id 6a1803df08f44-6e44569bdb9mr4703916d6.25.1738871226492; Thu, 06 Feb 2025 11:47:06 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e43bacb6c5sm8756386d6.102.2025.02.06.11.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 11:47:06 -0800 (PST) From: Ricardo Ribalda Date: Thu, 06 Feb 2025 19:47:04 +0000 Subject: [PATCH v3 5/6] media: uvcvideo: Make power management granular Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-uvc-granpower-ng-v3-5-32d0d7b0c5d8@chromium.org> References: <20250206-uvc-granpower-ng-v3-0-32d0d7b0c5d8@chromium.org> In-Reply-To: <20250206-uvc-granpower-ng-v3-0-32d0d7b0c5d8@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Ricardo Ribalda X-Mailer: b4 0.13.0 Now that every ioctl takes care of their power management we can remove the "global" power management. Despite its size, this is a relatively big change. We hope that there are no size effects of it. If there are some specific devices that miss-behave, we can add a small quirk for them. This patch introduces a behavioral change for the uvc "trigger" button. It will not work unless the camera is streaming. We consider that this the most common (if not the only) usecase and therefore we do not consider it a regression. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_v4l2.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 63d1d06d3ff6..7fddea100ace 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -631,7 +631,6 @@ static int uvc_v4l2_open(struct file *file) { struct uvc_streaming *stream; struct uvc_fh *handle; - int ret = 0; stream = video_drvdata(file); uvc_dbg(stream->dev, CALLS, "%s\n", __func__); @@ -641,12 +640,6 @@ static int uvc_v4l2_open(struct file *file) if (!handle) return -ENOMEM; - ret = uvc_status_get(stream->dev); - if (ret) { - kfree(handle); - return ret; - } - v4l2_fh_init(&handle->vfh, &stream->vdev); v4l2_fh_add(&handle->vfh); handle->chain = stream->chain; @@ -680,7 +673,6 @@ static int uvc_v4l2_release(struct file *file) kfree(handle); file->private_data = NULL; - uvc_status_put(stream->dev); return 0; }