From: "Michał Winiarski" <michal.winiarski@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 12/12] HAX Enable GuC Submission for CI
Date: Wed, 25 Oct 2017 22:00:20 +0200 [thread overview]
Message-ID: <20171025200020.16636-13-michal.winiarski@intel.com> (raw)
In-Reply-To: <20171025200020.16636-1-michal.winiarski@intel.com>
Also:
Revert "drm/i915/guc: Assert that we switch between known ggtt->invalidate functions"
This reverts commit 04f7b24eccdfae680a36e9825fe0d61dcd5ed528.
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++------
drivers/gpu/drm/i915/i915_params.h | 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 5eaa6893daaa..7dcf931abe37 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3568,17 +3568,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.h b/drivers/gpu/drm/i915/i915_params.h
index c7292268ed43..c38cef07b9fe 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -44,8 +44,8 @@
param(int, disable_power_well, -1) \
param(int, enable_ips, 1) \
param(int, invert_brightness, 0) \
- param(int, enable_guc_loading, 0) \
- param(int, enable_guc_submission, 0) \
+ param(int, enable_guc_loading, 1) \
+ param(int, enable_guc_submission, 1) \
param(int, guc_log_level, -1) \
param(char *, guc_firmware_path, NULL) \
param(char *, huc_firmware_path, NULL) \
--
2.13.6
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-10-25 20:05 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 20:00 [PATCH 00/12] Preemption with GuC, fourth try Michał Winiarski
2017-10-25 20:00 ` [PATCH v2 01/12] drm/i915/guc: Do not use 0 for GuC doorbell cookie Michał Winiarski
2017-10-25 20:00 ` [PATCH 02/12] drm/i915/guc: Extract GuC stage desc pool creation into a helper Michał Winiarski
2017-10-25 20:00 ` [PATCH v2 03/12] drm/i915/guc: Allocate separate shared data object for GuC communication Michał Winiarski
2017-10-25 21:04 ` Michel Thierry
2017-10-25 20:00 ` [PATCH v2 04/12] drm/i915/guc: Add preemption action to GuC firmware interface Michał Winiarski
2017-10-25 20:00 ` [PATCH v3 05/12] drm/i915/guc: Add a second client, to be used for preemption Michał Winiarski
2017-10-26 12:50 ` Michal Wajdeczko
2017-10-26 13:20 ` [PATCH v4] " Michał Winiarski
2017-10-26 13:32 ` [PATCH v5] " Michał Winiarski
2017-10-26 13:44 ` Michal Wajdeczko
2017-10-26 14:17 ` [PATCH v6] " Michał Winiarski
2017-10-26 18:49 ` Michel Thierry
2017-10-26 20:02 ` Chris Wilson
2017-10-26 20:15 ` Michel Thierry
2017-10-25 20:00 ` [PATCH 06/12] drm/i915/guc: Split guc_wq_item_append Michał Winiarski
2017-10-25 20:00 ` [PATCH v2 07/12] drm/i915: Extract "emit write" part of emit breadcrumb functions Michał Winiarski
2017-10-25 20:00 ` [PATCH 08/12] drm/i915: Add information needed to track engine preempt state Michał Winiarski
2017-10-25 20:00 ` [PATCH v2 09/12] drm/i915/guc: Keep request->priority for its lifetime Michał Winiarski
2017-10-25 20:00 ` [PATCH v3 10/12] drm/i915: Rename helpers used for unwinding, use macro for can_preempt Michał Winiarski
2017-10-25 20:15 ` Chris Wilson
2017-10-25 20:00 ` [PATCH v4 11/12] drm/i915/guc: Preemption! With GuC Michał Winiarski
2017-10-25 20:24 ` Chris Wilson
2017-10-25 21:14 ` Chris Wilson
2017-10-26 7:27 ` [PATCH v5] " Michał Winiarski
2017-10-26 13:35 ` [PATCH v6] " Michał Winiarski
2017-10-25 20:00 ` Michał Winiarski [this message]
2017-10-25 21:06 ` ✗ Fi.CI.BAT: failure for Preemption with GuC, fourth try Patchwork
2017-10-26 7:48 ` ✗ Fi.CI.BAT: warning for Preemption with GuC, fourth try (rev2) Patchwork
2017-10-26 13:41 ` ✗ Fi.CI.BAT: warning for Preemption with GuC, fourth try (rev3) Patchwork
2017-10-26 13:59 ` ✓ Fi.CI.BAT: success for Preemption with GuC, fourth try (rev5) Patchwork
2017-10-26 14:43 ` ✗ Fi.CI.BAT: warning for Preemption with GuC, fourth try (rev6) Patchwork
2017-10-26 15:18 ` ✓ Fi.CI.IGT: success for Preemption with GuC, fourth try (rev5) Patchwork
2017-10-26 15:59 ` ✓ Fi.CI.IGT: success for Preemption with GuC, fourth try (rev6) Patchwork
2017-10-26 20:37 ` [PATCH 00/12] Preemption with GuC, fourth try Chris Wilson
-- strict thread matches above, loose matches on Subject: below --
2017-10-09 14:52 [PATCH 00/12] Preemption with GuC, second try Michał Winiarski
2017-10-09 14:52 ` [PATCH 12/12] HAX Enable GuC Submission for CI Michał Winiarski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171025200020.16636-13-michal.winiarski@intel.com \
--to=michal.winiarski@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.