Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35FED6E28A for ; Fri, 4 Jun 2021 08:25:42 +0000 (UTC) From: Petri Latvala Date: Fri, 4 Jun 2021 11:27:19 +0300 Message-Id: <20210604082720.13281-1-petri.latvala@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 1/2] Revert "i915/gem_exec_schedule: Check 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 1fbc1e7d602f96a7f4e2b95057eef994656b8e74. Signed-off-by: Petri Latvala Cc: Chris Wilson Cc: Ashutosh Dixit Cc: Tejas Upadhyay --- tests/i915/gem_exec_schedule.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c index e205f272..6147ff96 100644 --- a/tests/i915/gem_exec_schedule.c +++ b/tests/i915/gem_exec_schedule.c @@ -505,7 +505,8 @@ static void timeslice(int i915, unsigned int engine) * switch to the other batch in order to advance. */ - igt_require(gem_scheduler_has_timeslicing(i915)); + igt_require(gem_scheduler_has_semaphores(i915)); + igt_require(gem_scheduler_has_preemption(i915)); igt_require(intel_gen(intel_get_drm_devid(i915)) >= 8); obj.handle = timeslicing_batches(i915, &offset); @@ -601,7 +602,8 @@ static void timesliceN(int i915, unsigned int engine, int count) * switch to the other batch in order to advance. */ - igt_require(gem_scheduler_has_timeslicing(i915)); + igt_require(gem_scheduler_has_semaphores(i915)); + igt_require(gem_scheduler_has_preemption(i915)); igt_require(intel_gen(intel_get_drm_devid(i915)) >= 8); /* No coupling between requests; free to timeslice */ @@ -633,7 +635,8 @@ static void lateslice(int i915, unsigned int engine, unsigned long flags) igt_spin_t *spin[3]; uint32_t ctx; - igt_require(gem_scheduler_has_timeslicing(i915)); + igt_require(gem_scheduler_has_semaphores(i915)); + igt_require(gem_scheduler_has_preemption(i915)); igt_require(intel_gen(intel_get_drm_devid(i915)) >= 8); ctx = gem_context_create(i915); @@ -739,7 +742,8 @@ static void submit_slice(int i915, * especially when that work is coperating with the spinner. */ - igt_require(gem_scheduler_has_timeslicing(i915)); + igt_require(gem_scheduler_has_semaphores(i915)); + igt_require(gem_scheduler_has_preemption(i915)); igt_require(intel_gen(intel_get_drm_devid(i915)) >= 8); __for_each_physical_engine(i915, cancel) { @@ -816,7 +820,7 @@ static void semaphore_userlock(int i915, unsigned long flags) igt_spin_t *spin = NULL; uint32_t scratch; - igt_require(gem_scheduler_has_timeslicing(i915)); + igt_require(gem_scheduler_has_semaphores(i915)); /* * Given the use of semaphores to govern parallel submission @@ -2869,7 +2873,8 @@ igt_main igt_subtest_group { igt_fixture { - igt_require(gem_scheduler_has_timeslicing(fd)); + igt_require(gem_scheduler_has_semaphores(fd)); + igt_require(gem_scheduler_has_preemption(fd)); igt_require(intel_gen(intel_get_drm_devid(fd)) >= 8); } -- 2.29.2 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev