From patchwork Fri Feb 7 14:50:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 13965234 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ADF3CC02199 for ; Fri, 7 Feb 2025 14:52:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42B0810EB31; Fri, 7 Feb 2025 14:52:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="qvGkfMHE"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E80110E27D; Fri, 7 Feb 2025 14:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3XQJzRbgL8tnck7KJu/Sdjwl0+++6CK1Pkdg0qyVaTo=; b=qvGkfMHEHxstbYHOjdqcSEpWe/ vR9Yaa9rrjJorUWCunBRjgBTrbmD3xbPe51N5Az5tBJwV//MBxdO7MBF0cofuWpJm16pv3+RoePyU gRUvAUExVahiWXtqNlSGnICMhZxpOakccieANsl9jYrlS24tttcIcpvWPSYXx60xukUoOQxT566qe rgplGhEGFN56a1CapxYtL+ebbd9pCEX/awPRRQ6l3YOF3B2uzcGY3bmVuJDGyCu5vciEf3tMzkaj4 ut4NmU9n0wiaiuc/Bh2VXK+3Fc9OKighzzb9Ju1bZkowbojTP8oXdbgTD4ScE3ws2bBPNgadBTbol BVz/FfcA==; Received: from [90.241.98.187] (helo=localhost) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1tgPhA-005sp2-3z; Fri, 07 Feb 2025 15:51:10 +0100 From: Tvrtko Ursulin To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-dev@igalia.com, Tvrtko Ursulin , =?utf-8?q?Christian_K=C3=B6nig?= , Danilo Krummrich , Matthew Brost , Philipp Stanner Subject: [PATCH v4 0/6] drm/sched: Job queue peek/pop helpers and struct job re-order Date: Fri, 7 Feb 2025 14:50:58 +0000 Message-ID: <20250207145104.60455-1-tvrtko.ursulin@igalia.com> X-Mailer: git-send-email 2.48.0 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Lets add some helpers for peeking and popping from the job queue which allows us to re-order the fields in struct drm_sched_job and remove one hole. As in the process we have added a header file for scheduler internal prototypes, lets also use it more and cleanup the "exported" header a bit. v2: * Add header file for internal scheduler API. * Add helper for peeking too. (Danilo) * Add (temporary?) drm_sched_cancel_all_jobs() helper to replace amdgpu amdgpu_job_stop_all_jobs_on_sched(). v3: * Settle for a copy of __drm_sched_entity_queue_pop in amdgpu for now. v4: * Expand the series with some more header file cleanup. Cc: Christian König Cc: Danilo Krummrich Cc: Matthew Brost Cc: Philipp Stanner Tvrtko Ursulin (6): drm/sched: Add internal job peek/pop API drm/amdgpu: Pop jobs from the queue more robustly drm/sched: Remove a hole from struct drm_sched_job drm/sched: Move drm_sched_entity_is_ready to internal header drm/sched: Move internal prototypes to internal header drm/sched: Group exported prototypes by object type drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 22 +++- drivers/gpu/drm/scheduler/sched_entity.c | 23 +--- drivers/gpu/drm/scheduler/sched_fence.c | 2 + drivers/gpu/drm/scheduler/sched_internal.h | 89 +++++++++++++++ drivers/gpu/drm/scheduler/sched_main.c | 7 +- include/drm/gpu_scheduler.h | 122 +++++++++------------ 6 files changed, 169 insertions(+), 96 deletions(-) create mode 100644 drivers/gpu/drm/scheduler/sched_internal.h