[igt-dev] [PATCH i-g-t 2/2] Revert "lib/i915: find scheduler caps for timeslicing"

Petri Latvala petri.latvala at intel.com
Fri Jun 4 08:27:20 UTC 2021


Timeslicing patches had an issue, reverting them to be reworked.

This reverts commit 5b6c56720993ca593a414cef91a0182bf939e14c.

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Ashutosh Dixit <ashutosh.dixit at intel.com>
Cc: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay at intel.com>
---
 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



More information about the igt-dev mailing list