From: Sagar Arun Kamble <sagar.a.kamble@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 6/6] HAX enable GuC submission for CI
Date: Thu, 16 Nov 2017 15:23:55 +0530 [thread overview]
Message-ID: <1510826035-23611-7-git-send-email-sagar.a.kamble@intel.com> (raw)
In-Reply-To: <1510826035-23611-1-git-send-email-sagar.a.kamble@intel.com>
Also revert ("drm/i915/guc: Assert that we switch between
known ggtt->invalidate functions")
---
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 f92a39f..5bbb3be 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3590,17 +3590,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 c729226..c38cef0 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) \
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-11-16 9:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 9:53 [PATCH v2 0/6] GuC submission functions/struct name/prototype update Sagar Arun Kamble
2017-11-16 9:53 ` [PATCH v2 1/6] drm/i915: Update execlists tasklet naming Sagar Arun Kamble
2017-11-16 10:08 ` Chris Wilson
2017-11-16 13:02 ` Sagar Arun Kamble
2017-11-16 9:53 ` [PATCH v2 2/6] drm/i915/guc: Update names of submission related static functions Sagar Arun Kamble
2017-11-16 11:25 ` Michal Wajdeczko
2017-11-16 9:53 ` [PATCH v2 3/6] drm/i915/guc: Update name and prototype of GuC submission interface functions Sagar Arun Kamble
2017-11-16 11:10 ` Michal Wajdeczko
2017-11-16 9:53 ` [PATCH v2 4/6] drm/i915/guc: Rename i915_guc_client struct to intel_guc_client Sagar Arun Kamble
2017-11-16 9:53 ` [PATCH v2 5/6] drm/i915/guc: Rename i915_guc_submission.c|h to intel_guc_submission.c|h Sagar Arun Kamble
2017-11-16 9:53 ` Sagar Arun Kamble [this message]
2017-11-16 10:10 ` ✓ Fi.CI.BAT: success for GuC submission functions/struct name/prototype update (rev2) Patchwork
2017-11-16 11:05 ` ✗ Fi.CI.IGT: warning " Patchwork
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=1510826035-23611-7-git-send-email-sagar.a.kamble@intel.com \
--to=sagar.a.kamble@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.