[PATCH v14 19/25] drm/i915/guc: Disable GuC GGTT invalidate post RESET

Sagar Arun Kamble sagar.a.kamble at intel.com
Tue Oct 17 10:37:08 UTC 2017


We need to revert GuC GGTT invalidate function at the end of reset as it
is set up back again during GuC load.

v2: Updated commit message.

v3: Limiting change to reset.

Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: MichaƂ Winiarski <michal.winiarski at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 170765f..a27e6d9 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -423,6 +423,9 @@ void intel_uc_reset_state(struct drm_i915_private *dev_priv)
 	struct intel_huc *huc = &dev_priv->huc;
 
 	if (i915_modparams.enable_guc_loading) {
+		if (guc->fw.load_status == INTEL_UC_FIRMWARE_SUCCESS)
+			i915_ggtt_disable_guc(dev_priv);
+
 		spin_lock_irq(&dev_priv->irq_lock);
 		guc->interrupt_clients = 0;
 		spin_unlock_irq(&dev_priv->irq_lock);
-- 
1.9.1



More information about the Intel-gfx-trybot mailing list