From patchwork Mon Feb 24 18:52:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 22846 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6C3B5C32A9 for ; Mon, 24 Feb 2025 18:52:52 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 810A9686F5; Mon, 24 Feb 2025 19:52:51 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="FbZst+Pu"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5807861856 for ; Mon, 24 Feb 2025 19:52:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740423168; 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; bh=rHGO7oDuvITilIbIcnGDlpIdYb6tJ2najftlJxhZzO4=; b=FbZst+PudbBi63AMvx6TisfTQt8HgTPdx5/5dGkGcbJdjN22oUpCXnW1qQfmCHLFc9kveE eeYsW4qBEcLdT58CbNEVnwJfXkt41e+Z9M6j5qnwdi66Mg/VJ/amZH8jOuQFHQs0tMovtH /WGQtYp+sY6i0B+PjiLXBYzOqthE2CY= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-Ubh24ILnMaWMCOf9BkeAVQ-1; Mon, 24 Feb 2025 13:52:44 -0500 X-MC-Unique: Ubh24ILnMaWMCOf9BkeAVQ-1 X-Mimecast-MFC-AGG-ID: Ubh24ILnMaWMCOf9BkeAVQ_1740423164 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8C04419373D9; Mon, 24 Feb 2025 18:52:43 +0000 (UTC) Received: from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.225.60]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A39CC180087D; Mon, 24 Feb 2025 18:52:41 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Stanislaw Gruszka , Laurent Pinchart , Kieran Bingham Subject: [PATCH v2 0/5] Fix occasional software ISP assertion error on stop Date: Mon, 24 Feb 2025 19:52:30 +0100 Message-ID: <20250224185235.43381-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8eznbE3mleqCribDidSL9wQJC6ebx8FM4EFSV1Own3w_1740423164 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When software ISP is stopped, there can be pending messages in the message queue that will attempt to call the already stopped IPA, resulting in an assertion error like this: FATAL default soft_ipa_proxy.cpp:456 assertion "state_ == ProxyRunning" failed in processStatsThread() This patch series fixes the problem and also attempts to prevent other problems related to message handling when or after software ISP is stopped. Changes in v2: - The receiver check in Thread::dispatchMessages moved to the right place. Milan Zamazal (5): libcamera: software_isp: Emit ispStatsReady only if IPA is running libcamera: software_isp: Handle queued output buffers on stop libcamera: software_isp: Handle queued input buffers on stop libcamera: base: Fix formatting in thread.cpp libcamera: software_isp: Modify dispatching messages on stop include/libcamera/base/thread.h | 3 +- .../internal/software_isp/software_isp.h | 3 ++ src/libcamera/base/thread.cpp | 20 ++++---- src/libcamera/software_isp/software_isp.cpp | 46 +++++++++++++++++-- .../libcamera_templates/proxy_functions.tmpl | 2 +- 5 files changed, 59 insertions(+), 15 deletions(-)