Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84CC06E15D for ; Fri, 4 Jun 2021 08:25:39 +0000 (UTC) From: Petri Latvala Date: Fri, 4 Jun 2021 11:27:20 +0300 Message-Id: <20210604082720.13281-2-petri.latvala@intel.com> In-Reply-To: <20210604082720.13281-1-petri.latvala@intel.com> References: <20210604082720.13281-1-petri.latvala@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 2/2] Revert "lib/i915: find scheduler caps for timeslicing" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Petri Latvala , Chris Wilson List-ID: Timeslicing patches had an issue, reverting them to be reworked. This reverts commit 5b6c56720993ca593a414cef91a0182bf939e14c. Signed-off-by: Petri Latvala Cc: Chris Wilson Cc: Ashutosh Dixit Cc: Tejas Upadhyay --- lib/i915/gem_scheduler.c | 21 --------------------- lib/i915/gem_scheduler.h | 1 - 2 files changed, 22 deletions(-) diff --git a/lib/i915/gem_scheduler.c b/lib/i915/gem_scheduler.c index 6dfa3676..184da843 100644 --- a/lib/i915/gem_scheduler.c +++ b/lib/i915/gem_scheduler.c @@ -29,7 +29,6 @@ #include "ioctl_wrappers.h" #include "i915/gem_scheduler.h" -#include "i915/gem_submission.h" /** * SECTION:gem_scheduler @@ -130,22 +129,6 @@ bool gem_scheduler_has_engine_busy_stats(int fd) I915_SCHEDULER_CAP_ENGINE_BUSY_STATS; } -/** - * gem_scheduler_has_timeslicing: - * @fd: open i915 drm file descriptor - * - * Feature test macro to query whether the driver supports using HW preemption - * to implement timeslicing of userspace batches. This allows userspace to - * implement micro-level scheduling within their own batches. - */ -bool gem_scheduler_has_timeslicing(int fd) -{ - return ((gem_scheduler_capability(fd) & - (I915_SCHEDULER_CAP_PREEMPTION | - I915_SCHEDULER_CAP_SEMAPHORES)) - || gem_has_guc_submission(fd)); -} - /** * gem_scheduler_print_capability: * @fd: open i915 drm file descriptor @@ -168,8 +151,4 @@ void gem_scheduler_print_capability(int fd) igt_info(" - With HW semaphores enabled\n"); if (caps & I915_SCHEDULER_CAP_ENGINE_BUSY_STATS) igt_info(" - With engine busy statistics\n"); - if ((caps & (I915_SCHEDULER_CAP_PREEMPTION - | I915_SCHEDULER_CAP_SEMAPHORES)) - || gem_has_guc_submission(fd)) - igt_info(" - With timeslicing enabled\n"); } diff --git a/lib/i915/gem_scheduler.h b/lib/i915/gem_scheduler.h index d43e84bd..14bd4cac 100644 --- a/lib/i915/gem_scheduler.h +++ b/lib/i915/gem_scheduler.h @@ -32,7 +32,6 @@ bool gem_scheduler_has_ctx_priority(int fd); bool gem_scheduler_has_preemption(int fd); bool gem_scheduler_has_semaphores(int fd); bool gem_scheduler_has_engine_busy_stats(int fd); -bool gem_scheduler_has_timeslicing(int fd); void gem_scheduler_print_capability(int fd); #endif /* GEM_SCHEDULER_H */ -- 2.29.2 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev