From patchwork Tue Sep 19 05:01:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Brost X-Patchwork-Id: 13390818 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 638A9CD3439 for ; Tue, 19 Sep 2023 05:01:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6016410E3AF; Tue, 19 Sep 2023 05:01:43 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D91C10E153; Tue, 19 Sep 2023 05:01:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695099701; x=1726635701; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=GEsg8O3fRUPfwPpoB9VtDLexW8dBWxl4DiOJZYIewi0=; b=C0+3D7emHIw1sWB+ySyCuRAwuG/ZyklSqlDKDuOiCbo0JNbCbJKf/PYT xeOn2vqEQOauYP/G4xD+AmlBj+GCeUF9dh6siclwFINBsaB3kQfk9BWoN iyuOfXtSJMpPZonjlryoQdnSn8qNkdXiOY5pzjuTtxlw+uuT4+dI/Q3Jp 23LihFk2xMp0GziJM71vzv3CND7ZgEmX/EMxLet0wsdQgEt/qzuk2ZOrX wObsHoRiLjjkwYj4D8ASjlABWbfR6TAs5itOuPCSqvvN7iw61ZcAeNYol tyyB5y7q0dg92gLPWR3OwWnZ4sVe/mDFWA1HlHxRpEgEAgi5ZVjN4XawE w==; X-IronPort-AV: E=McAfee;i="6600,9927,10837"; a="377163408" X-IronPort-AV: E=Sophos;i="6.02,158,1688454000"; d="scan'208";a="377163408" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2023 22:01:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10837"; a="775409051" X-IronPort-AV: E=Sophos;i="6.02,158,1688454000"; d="scan'208";a="775409051" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2023 22:01:40 -0700 From: Matthew Brost To: dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: [PATCH v4 00/10] DRM scheduler changes for Xe Date: Mon, 18 Sep 2023 22:01:45 -0700 Message-Id: <20230919050155.2647172-1-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 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: , Cc: robdclark@chromium.org, thomas.hellstrom@linux.intel.com, Matthew Brost , lina@asahilina.net, sarah.walker@imgtec.com, ketil.johnsen@arm.com, Liviu.Dudau@arm.com, mcanal@igalia.com, luben.tuikov@amd.com, dakr@redhat.com, donald.robson@imgtec.com, boris.brezillon@collabora.com, christian.koenig@amd.com, faith.ekstrand@collabora.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" As a prerequisite to merging the new Intel Xe DRM driver [1] [2], we have been asked to merge our common DRM scheduler patches first. This a continuation of a RFC [3] with all comments addressed, ready for a full review, and hopefully in state which can merged in the near future. More details of this series can found in the cover letter of the RFC [3]. These changes have been tested with the Xe driver. v2: - Break run job, free job, and process message in own work items - This might break other drivers as run job and free job now can run in parallel, can fix up if needed v3: - Include missing patch 'drm/sched: Add drm_sched_submit_* helpers' - Fix issue with setting timestamp to early - Don't dequeue jobs for single entity after calling entity fini - Flush pending jobs on entity fini - Add documentation for entity teardown - Add Matthew Brost to maintainers of DRM scheduler v4: - Drop message interface - Drop 'Flush pending jobs on entity fini' - Drop 'Add documentation for entity teardown' - Address all feedback Matt Matthew Brost (10): drm/sched: Add drm_sched_submit_* helpers drm/sched: Convert drm scheduler to use a work queue rather than kthread drm/sched: Move schedule policy to scheduler drm/sched: Add DRM_SCHED_POLICY_SINGLE_ENTITY scheduling policy drm/sched: Split free_job into own work item drm/sched: Add drm_sched_start_timeout_unlocked helper drm/sched: Start submission before TDR in drm_sched_start drm/sched: Submit job before starting TDR drm/sched: Add helper to queue TDR immediately for current and future jobs drm/sched: Update maintainers of GPU scheduler MAINTAINERS | 1 + .../drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 5 +- drivers/gpu/drm/lima/lima_sched.c | 5 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 6 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 5 +- drivers/gpu/drm/nouveau/nouveau_sched.c | 5 +- drivers/gpu/drm/panfrost/panfrost_job.c | 5 +- drivers/gpu/drm/scheduler/sched_entity.c | 85 ++- drivers/gpu/drm/scheduler/sched_fence.c | 2 +- drivers/gpu/drm/scheduler/sched_main.c | 491 ++++++++++++------ drivers/gpu/drm/v3d/v3d_sched.c | 25 +- include/drm/gpu_scheduler.h | 48 +- 15 files changed, 495 insertions(+), 220 deletions(-) Tested-by: Danilo Krummrich Tested-by: Boris Brezillon