From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 50BD219CD0A for ; Tue, 14 Apr 2026 13:38:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776173933; cv=none; b=EP6nfsD0kf75/aniW94h8uOGOSuCq407/r80n8ZuRkgpysF7Kna5G8NVBAdI+YlvXNdWBSvrkaiWSURj2YPqup/nuL85gRYGSzqsI+Rd8n8dtGg6yySFTs+Jk/s0TIqAcen+mRwaxhju/3qG2IyzkiEuw6IJX7540lmBQJVyRsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776173933; c=relaxed/simple; bh=Kku6nJKrBYOq+QAdCBbdd+MU0pFbD9UDQdUDbtSpiVI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E/WJr9E+O0oSmFv11RZnEvtn/0CfOqeX7mm1CEj2vY4xtZvdbqryO7I3g0F177D2CeRDdGOtsXhOjHS4RkED8l7GN281gzj17b/Do6gvflrz4KiRMZeaRWdfwto8BNghw7G6rHcFxxhIwszPjpCtBJdMg8YRk1F5dNc6oDcnCK0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LIa3WnO9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LIa3WnO9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E806C19425; Tue, 14 Apr 2026 13:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776173933; bh=Kku6nJKrBYOq+QAdCBbdd+MU0pFbD9UDQdUDbtSpiVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LIa3WnO9MAjxllNO5O9RRgVcE+n1pQW3gYwB7LDlPyGmPFe68WMbgUbczs8M+RJVH WAenISCputl55ibCQT5cpqHGZzzbX1RiNnq5evLNDqR9q3pRaLVPTlpfLWhEYPaZnl HJgPIm6V97vqVclk6P1oXH1Xef0uBnfZTqVC3eJJSq4DaRqP2rloT1Mg5K1NyKvQPM hMA58tKQWxb6Uh8UDVJ9VPKFnlx8w5BgseWD8044lnYsa1LL1DAsAdZVvy/5XqGr6I f2vp6HZuE2mIBwyjeP4aWo068TmHgNK8ZFLFMMPW49cRqRd9MFCfrt1jF+txAZuFQD 9fJJ3JW/qr1Xw== From: Philipp Stanner To: Lyude Paul , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matthew Brost , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Dave Airlie , Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@kernel.vger.org Subject: [PATCH 2/2] drm/nouveau: Fix double call to drm_sched_entity_fini() Date: Tue, 14 Apr 2026 15:37:35 +0200 Message-ID: <20260414133734.130115-3-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260414133734.130115-2-phasta@kernel.org> References: <20260414133734.130115-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nouveau_abi16_chan_fini() does invoke drm_sched_entity_fini() twice: Once directly, and a second time through nouveau_sched_destroy(). That's likely undesired behavior and might be a bug since drm_sched_entity_fini() decrements reference counts. Fix the issue by using the appropriate function, drm_sched_entity_flush(), to ensure that the entity becomes idle. Cc: stable@kernel.vger.org Fixes: 9a0c32d698c1 ("drm/nouveau: don't fini scheduler if not initialized") Suggested-by: Danilo Krummrich Signed-off-by: Philipp Stanner --- drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index 7860877d909b..291203121f0c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -176,7 +176,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, /* Cancel all jobs from the entity's queue. */ if (chan->sched) - drm_sched_entity_fini(&chan->sched->entity); + drm_sched_entity_kill(&chan->sched->entity); if (chan->chan) nouveau_channel_idle(chan->chan); -- 2.49.0