From patchwork Mon Feb 24 10:34:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13987777 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (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 F2D4C255E4E for ; Mon, 24 Feb 2025 10:35:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393302; cv=none; b=QcoDz6CVjrB14qEG0oAWzdSmf1JwChdD6AtmlRRi5MG3RJTqHjyQEhs0xnVI+pFrbjkZJnMrmafFUlA5qA5hyKck965TWywG5/U9+Pp9lQzCWwEr5APcI/XT7FvLooMeuSBsUpfVt63HlvMqnqubUQUbjjmhjH0SBvtUHxveH/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393302; c=relaxed/simple; bh=sdce7IzPAWOPBlp9w7GmVc+7zDnqq6RpXhnvyRYvo7w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ISBkqsa1dYgpq3cauGYYdfKbVUNvCfBHnnJWfzKIJq+g5WtkUJLe50d5RguMmypzGZc16D+gODXUecSIpP8H8pTY2n/dNJiFQrJCatMpuecnhXGAHUDIFH8QOl4wNphtgEroqrvosJaweO1iNBlPouxo5p3kfqgRbRlu1Sbk1wA= 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=Y0TB+K5h; arc=none smtp.client-ip=209.85.219.41 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="Y0TB+K5h" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6dd0d09215aso29384716d6.2 for ; Mon, 24 Feb 2025 02:35:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740393300; x=1740998100; 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=LDBMWb4EY7onVf4QJeXNUmC3vcoRuBZNuT+yUekjkJQ=; b=Y0TB+K5hr1/STb/e5hixDLC2vrICvzhpRLWqDsS7X9ct86uI8l6alNgv3WjIQwa9rk eajzU9wXDek99rclw5qfcZ15aUsHvYJXy6TnLcii4nrCqi6Q42td2nP5NajYWN2JWms9 dpuGxS2ajWAjxSqrpZOG07jcwSXUh1td5VfOw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740393300; x=1740998100; 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=LDBMWb4EY7onVf4QJeXNUmC3vcoRuBZNuT+yUekjkJQ=; b=jEUGl5Vn37EUyn0v0EF6Lycdxfp3VH0PLFeZOVoBm3XcmMA+mWen+Y3f9TUU64Lqct XO9P969QjM/NZuyVuPVgDCXJo3WSu2Mu6ihqsiBKsLErI6ErfBnefduHN/drYkgRtl1S qoZ4iHY9AHNU4Csg+RXrHSTOhixg3BjBhPNrdn2pbBw6DEwK3L6hh/iWLiHXxwFn3ySi go4ViEULMwRxsJHHsZRQUs3/jNUFX9ZJqdDj7SCH/96BaPi7KkW4eye9shxEwKW/Sq69 TTpkBRg8TQJYzmldcNJFVS5ypr4zMBUMvOCXZvuTfGcyMBDuqQwQgT7BlzImDbDBv7nq ZKYQ== X-Gm-Message-State: AOJu0Yx+wSpp0I9DWOja/mJ5z9F6zGvirZzs6CGXVaIkA6rQS/EQQQYE gZus1T64wtsRPRA6XFHrxkBn0Btkit+6Oau3vUqYvVyp5Sgd124IWSq3vCQ91w== X-Gm-Gg: ASbGncvdQ9DSvJRcq3zGC+uutVilMdQElFt3ZcvGY3CYdCdgg9dG0M4Ev3Cj8eIc/r0 WlS6CvvTFQtgwzhtsue93fKmnamQbAWa3TMnYdf/YsnoKLkTolDtz0iKN1AtJM35dKLHsVv2zLt 8P+u5zl4Zshh+r1cxz2XnYwGcO7m5/a9fTd9K1+aYyJzeO+MvyV8nlAmUMszmwDcDg2G7nHp5AK 5E/MXs66Mp+YHXe+O3DePzs0BOL89pU0EEDhWSo+hoVi4Y6hLHa0VTKESfPFMBddj5b9UWoxuy3 R8nP3SBXNZBsVQp3DSYZ0qT5480OVu2SC5t2zCXyECeV13LaG8Emh0vY3EbfDwaMrd6GMFhDWrc Esi8= X-Google-Smtp-Source: AGHT+IFL2G6nlS0x1tvmzLvi/Z81P9HYgn38ttQ4HgDtQAzXQAOsKOTGkfcdbCKeON5iaFKLYPwyeQ== X-Received: by 2002:a05:6214:e8c:b0:6d8:f0ba:ea92 with SMTP id 6a1803df08f44-6e6b00fca57mr166811326d6.21.1740393299864; Mon, 24 Feb 2025 02:34:59 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c0b0b7f637sm787139985a.33.2025.02.24.02.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 02:34:58 -0800 (PST) From: Ricardo Ribalda Date: Mon, 24 Feb 2025 10:34:54 +0000 Subject: [PATCH v2 2/3] media: uvcvideo: Send control events for partial succeeds Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250224-uvc-data-backup-v2-2-de993ed9823b@chromium.org> References: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> In-Reply-To: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@kernel.org X-Mailer: b4 0.14.1 Today, when we are applying a change to entities A, B. If A succeeds and B fails the events for A are not sent. This change changes the code so the events for A are send right after they happen. Cc: stable@kernel.org Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events") Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index f2484f6d21c1..7d074686eef4 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1705,7 +1705,9 @@ static bool uvc_ctrl_xctrls_has_control(const struct v4l2_ext_control *xctrls, } static void uvc_ctrl_send_events(struct uvc_fh *handle, - const struct v4l2_ext_control *xctrls, unsigned int xctrls_count) + struct uvc_entity *entity, + const struct v4l2_ext_control *xctrls, + unsigned int xctrls_count) { struct uvc_control_mapping *mapping; struct uvc_control *ctrl; @@ -1716,6 +1718,9 @@ static void uvc_ctrl_send_events(struct uvc_fh *handle, u32 changes = V4L2_EVENT_CTRL_CH_VALUE; ctrl = uvc_find_control(handle->chain, xctrls[i].id, &mapping); + if (ctrl->entity != entity) + continue; + if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) /* Notification will be sent from an Interrupt event. */ continue; @@ -1954,11 +1959,12 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, uvc_ctrl_find_ctrl_idx(entity, ctrls, err_ctrl); goto done; + } else if (ret > 0 && !rollback) { + uvc_ctrl_send_events(handle, entity, + ctrls->controls, ctrls->count); } } - if (!rollback) - uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); ret = 0; done: mutex_unlock(&chain->ctrl_mutex);