From patchwork Thu Oct 26 04:12:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Brost X-Patchwork-Id: 13437206 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 030ADC25B48 for ; Thu, 26 Oct 2023 04:12:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FA5110E74C; Thu, 26 Oct 2023 04:12:11 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C92810E74C; Thu, 26 Oct 2023 04:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698293529; x=1729829529; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=WT50UlYgFqILPLXA3UdpBaBOjFYNfaRQWbX3QSgAWao=; b=J7TjNn1GfTSj/Im6+eKHQoVKqgFRh+M926S0ZAPTZqm+Gp5nd3kvSAuU gHz4lQt5Mz8unDD0MrRujCHWr6HnwR3IgQwUwow9lT9Flzorce3WQ6yrY aAdPpOlfHfnEElu3KN8zCI0pwvxut9+GVbLRloGzocJFmBK1mPrrPxHGW 9u8PkGjenkPP329qLZgE4jqzfUSqHsNpURcOqRQ33w0uU7HSVESQlze25 v//zNbFZMQMDvtLnjdY+QbBy1XrqbP0klx3FeZE1DR4TLpiIIJRjygbUK hBuBRKBGwRPnaiFcbnQBOz9sJ/4nNaFAQwh5LP33MAjip31XxJvf0a8UW w==; X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="377822989" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="377822989" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 21:12:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="762685118" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="762685118" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 21:12:07 -0700 From: Matthew Brost To: dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: [PATCH v7 0/6] DRM scheduler changes for Xe Date: Wed, 25 Oct 2023 21:12:30 -0700 Message-Id: <20231026041236.1273694-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. Based on drm-tip branch. A follow up series will be posted to address some of dakr requets for kernel doc changes. 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 v5: - Address Luben's feedback - Drop starting TDR after calling run_job() - Drop adding Matthew Brost to maintainers of DRM scheduler v6: - Address Luben's feedback - Include base commit v7: - Drop SINGLE_ENTITY mode rather pull in Luben's patch for dynamic run queues - Address Luben's feedback for free_job work item patch Matt [1] https://gitlab.freedesktop.org/drm/xe/kernel [2] https://patchwork.freedesktop.org/series/112188/ [3] https://patchwork.freedesktop.org/series/116055/ Luben Tuikov (1): drm/sched: Convert the GPU scheduler to variable number of run-queues Matthew Brost (5): drm/sched: Add drm_sched_wqueue_* helpers drm/sched: Convert drm scheduler to use a work queue rather than kthread drm/sched: Split free_job into own work item drm/sched: Add drm_sched_start_timeout_unlocked helper drm/sched: Add a helper to queue TDR immediately .../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/amd/amdgpu/amdgpu_job.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 1 + drivers/gpu/drm/lima/lima_sched.c | 3 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 6 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 6 +- drivers/gpu/drm/nouveau/nouveau_sched.c | 3 +- drivers/gpu/drm/panfrost/panfrost_job.c | 1 + drivers/gpu/drm/scheduler/sched_entity.c | 18 +- drivers/gpu/drm/scheduler/sched_main.c | 444 ++++++++++++------ drivers/gpu/drm/v3d/v3d_sched.c | 10 +- include/drm/gpu_scheduler.h | 29 +- 14 files changed, 373 insertions(+), 184 deletions(-) base-commit: 201c8a7bd1f3f415920a2df4b8a8817e973f42fe