All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] HAX Enable GuC Submission for CI
@ 2017-09-12 16:44 Chris Wilson
  2017-09-12 17:33 ` ✗ Fi.CI.BAT: failure for HAX enable guc submission for CI (rev2) Patchwork
  0 siblings, 1 reply; 2+ messages in thread
From: Chris Wilson @ 2017-09-12 16:44 UTC (permalink / raw)
  To: intel-gfx

From: Michał Winiarski <michal.winiarski@intel.com>

Also:
Revert "drm/i915/guc: Assert that we switch between known ggtt->invalidate functions"

This reverts commit 04f7b24eccdfae680a36e9825fe0d61dcd5ed528.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20170912132226.25629-1-michal.winiarski@intel.com
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++------
 drivers/gpu/drm/i915/i915_params.c  | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 09e524dbc090..478a8d42aeb0 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3189,17 +3189,13 @@ int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv)
 
 void i915_ggtt_enable_guc(struct drm_i915_private *i915)
 {
-	GEM_BUG_ON(i915->ggtt.invalidate != gen6_ggtt_invalidate);
-
 	i915->ggtt.invalidate = guc_ggtt_invalidate;
 }
 
 void i915_ggtt_disable_guc(struct drm_i915_private *i915)
 {
-	/* We should only be called after i915_ggtt_enable_guc() */
-	GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
-
-	i915->ggtt.invalidate = gen6_ggtt_invalidate;
+	if (i915->ggtt.invalidate == guc_ggtt_invalidate)
+		i915->ggtt.invalidate = gen6_ggtt_invalidate;
 }
 
 void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 8ab003dca113..c9d72f1b8383 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -56,8 +56,8 @@ struct i915_params i915 __read_mostly = {
 	.verbose_state_checks = 1,
 	.nuclear_pageflip = 0,
 	.edp_vswing = 0,
-	.enable_guc_loading = 0,
-	.enable_guc_submission = 0,
+	.enable_guc_loading = 2,
+	.enable_guc_submission = 2,
 	.guc_log_level = -1,
 	.guc_firmware_path = NULL,
 	.huc_firmware_path = NULL,
-- 
2.14.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* ✗ Fi.CI.BAT: failure for HAX enable guc submission for CI (rev2)
  2017-09-12 16:44 [PATCH] HAX Enable GuC Submission for CI Chris Wilson
@ 2017-09-12 17:33 ` Patchwork
  0 siblings, 0 replies; 2+ messages in thread
From: Patchwork @ 2017-09-12 17:33 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: HAX enable guc submission for CI (rev2)
URL   : https://patchwork.freedesktop.org/series/20981/
State : failure

== Summary ==

Series 20981v2 HAX enable guc submission for CI
https://patchwork.freedesktop.org/api/1.0/series/20981/revisions/2/mbox/

Test debugfs_test:
        Subgroup read_all_entries:
                pass       -> SKIP       (fi-glk-2a)
Test drv_hangman:
        Subgroup error-state-basic:
                pass       -> SKIP       (fi-glk-2a)
Test gem_busy:
        Subgroup basic-busy-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-hang-default:
                pass       -> SKIP       (fi-glk-2a)
Test gem_close_race:
        Subgroup basic-process:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-threads:
                pass       -> SKIP       (fi-glk-2a)
Test gem_cpu_reloc:
        Subgroup basic:
                pass       -> SKIP       (fi-glk-2a)
Test gem_cs_tlb:
        Subgroup basic-default:
                pass       -> SKIP       (fi-glk-2a)
Test gem_ctx_create:
        Subgroup basic:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-files:
                pass       -> SKIP       (fi-glk-2a)
Test gem_ctx_exec:
        Subgroup basic:
                pass       -> SKIP       (fi-glk-2a)
Test gem_ctx_switch:
        Subgroup basic-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-default-heavy:
                pass       -> SKIP       (fi-glk-2a)
Test gem_exec_basic:
        Subgroup basic-blt:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-bsd:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-render:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-vebox:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup gtt-blt:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup gtt-bsd:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup gtt-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup gtt-render:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup gtt-vebox:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup readonly-blt:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup readonly-bsd:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup readonly-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup readonly-render:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup readonly-vebox:
                pass       -> SKIP       (fi-glk-2a)
Test gem_exec_create:
        Subgroup basic:
                pass       -> SKIP       (fi-glk-2a)
Test gem_exec_fence:
        Subgroup basic-busy-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-wait-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-await-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup await-hang-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup nb-await-default:
                pass       -> SKIP       (fi-glk-2a)
Test gem_exec_flush:
        Subgroup basic-batch-kernel-default-uc:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-batch-kernel-default-wb:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-uc-pro-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-uc-prw-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-uc-ro-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-uc-rw-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-uc-set-default:
                pass       -> SKIP       (fi-glk-2a)
        Subgroup basic-wb-pro-default:
                pass       -> SKIP       (fi-glk-2a)
WARNING: Long output truncated
fi-bdw-gvtdvm failed to connect after reboot

d20bacd600b766e206345b2a8810f3d50a9b0a55 drm-tip: 2017y-09m-12d-16h-53m-43s UTC integration manifest
934962995283 HAX Enable GuC Submission for CI

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5665/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-12 17:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-12 16:44 [PATCH] HAX Enable GuC Submission for CI Chris Wilson
2017-09-12 17:33 ` ✗ Fi.CI.BAT: failure for HAX enable guc submission for CI (rev2) Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.