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 81865175A6D for ; Wed, 15 Apr 2026 14:50:12 +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=1776264612; cv=none; b=KRRq/s0oLfkM4QT7jjlKHj8Ixu+9FdWn9kyyW8gAzhuGj+AacMRLS9dYNYEG+yxEFtvV5C2WTUnRbIwbP8i2EBleOlV1ZF0iCP6ZpSaui5o9AqsKQD9HuRbscREZ97fbS1u7TXKOB+b26b5Sgw4zYvJ08LyHTaXFqe95glYo+bs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776264612; c=relaxed/simple; bh=bTj679hg+QgqNHfBXLngWCLfh/g/zoJF5btZjg6oR+E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pr9GqhM6M4qsJEPXWrURWYodLF44n2AK9bvVtB73F3qh9whe4lqjYzbG0RS10kKvjqj9IYq2b5K0OKOIB42r1e2Zo6e5gtlq5SsZM3Z6YNM7fwPE3TZfvlG0lgpinXJzbIcoXNwrVxhJKgpA7pI8F9T2DKGbR856nqoQVHS4krQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XSpdZIxJ; 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="XSpdZIxJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A756FC19424; Wed, 15 Apr 2026 14:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776264612; bh=bTj679hg+QgqNHfBXLngWCLfh/g/zoJF5btZjg6oR+E=; h=From:To:Cc:Subject:Date:From; b=XSpdZIxJDfqWq2HVGDNhVjue3SP7VIOr+CBuu6YdW+LAozl/CLXj+pcTTBoXh/gsG nuTQlnf08v+xdmKJrrlvxmo+dB3+9ewc1xpwThXIUHGppDkuXK/yFTt1S+bQHLduIb o+Tag1mnPSckwojhVE3CfrFciPLHoXD8Nk1+GEDAFZRbqqm11FmS/YpX4O/BYgIIVc Myy7y2NJk7f3pScmD1fY65j7AcqoqnLnuPErcM6fYgE+kC6h4GYJzrXs4mmACERPPI vM05JyYVhFYyhWy6Gsa25qyR4Gd50FfYTcQIGJHOKYwp/9CrPp2nRsozHoew/G1EED /8gE0SZ2xbv2A== 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 Subject: [PATCH v2 1/2] drm/sched: Make drm_sched_entity_kill() a public function Date: Wed, 15 Apr 2026 16:49:56 +0200 Message-ID: <20260415144956.272506-2-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Some drivers do not care on teardown whether the last jobs pending in an entity are actually executed before teardown completed. For such scenarios, drm_sched_entity_flush() is not the ideal function since it's intended to wait for jobs to complete. Make drm_sched_entity_kill() public for that use-case and update the documentation. Suggested-by: Danilo Krummrich Signed-off-by: Philipp Stanner --- Changes in v2: - Improve wording, fix typo. --- drivers/gpu/drm/scheduler/sched_entity.c | 13 +++++++++++-- include/drm/gpu_scheduler.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 61a4818cc87b..7be5811b90cd 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -267,8 +267,16 @@ static void drm_sched_entity_kill_jobs_cb(struct dma_fence *f, schedule_work(&job->work); } -/* Remove the entity from the scheduler and kill all pending jobs */ -static void drm_sched_entity_kill(struct drm_sched_entity *entity) +/** + * drm_sched_entity_kill - kill an entity's pending jobs and remove it + * @entity: the entity to remove + * + * Removes the entity from the scheduler's run queue and kills all pending jobs. + * + * This function should be used over drm_sched_entity_flush() if it is not + * desired to actually wait for all pending jobs to finish. + */ +void drm_sched_entity_kill(struct drm_sched_entity *entity) { struct drm_sched_job *job; struct dma_fence *prev; @@ -306,6 +314,7 @@ static void drm_sched_entity_kill(struct drm_sched_entity *entity) } dma_fence_put(prev); } +EXPORT_SYMBOL(drm_sched_entity_kill); /** * drm_sched_entity_flush - Flush a context entity diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 53417baebd49..d61c19e78182 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -693,6 +693,7 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, unsigned int num_sched_list, atomic_t *guilty); long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout); +void drm_sched_entity_kill(struct drm_sched_entity *entity); void drm_sched_entity_fini(struct drm_sched_entity *entity); void drm_sched_entity_destroy(struct drm_sched_entity *entity); void drm_sched_entity_set_priority(struct drm_sched_entity *entity, -- 2.49.0