All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sagar Arun Kamble <sagar.a.kamble@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 11/14] drm/i915/guc: Fix GuC cleanup in unload path
Date: Tue, 19 Sep 2017 22:57:48 +0530	[thread overview]
Message-ID: <1505842071-12787-12-git-send-email-sagar.a.kamble@intel.com> (raw)
In-Reply-To: <1505842071-12787-1-git-send-email-sagar.a.kamble@intel.com>

We ensure that GuC is completely suspended and client is destroyed
in i915_gem_suspend during i915_driver_unload. So now intel_uc_fini_hw
should just take care of cleanup,
hence s/intel_uc_fini_hw/intel_uc_cleanup. Correspondingly
we also updated as s/i915_guc_submission_fini/i915_guc_submission_cleanup
Other functionality to disable communication, disable interrupts and
update of ggtt.invalidate is taken care by intel_uc_suspend.
With this patch we are also doing guc_free_load_err_log only
if i915.enable_guc_loading is set.
Created intel_guc_cleanup function to wrap the cleanup functions
specific to GuC.

Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c            |  2 +-
 drivers/gpu/drm/i915/i915_guc_submission.c |  2 +-
 drivers/gpu/drm/i915/intel_guc.c           |  8 ++++++++
 drivers/gpu/drm/i915/intel_guc.h           |  3 ++-
 drivers/gpu/drm/i915/intel_uc.c            | 15 ++++-----------
 drivers/gpu/drm/i915/intel_uc.h            |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index d54f35f..5f09185 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -602,7 +602,7 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)
 	i915_gem_drain_workqueue(dev_priv);
 
 	mutex_lock(&dev_priv->drm.struct_mutex);
-	intel_uc_fini_hw(dev_priv);
+	intel_uc_cleanup(dev_priv);
 	i915_gem_cleanup_engines(dev_priv);
 	i915_gem_contexts_fini(dev_priv);
 	i915_gem_cleanup_userptr(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index 94efe32..12f1195 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -1050,7 +1050,7 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
+void i915_guc_submission_cleanup(struct drm_i915_private *dev_priv)
 {
 	struct intel_guc *guc = &dev_priv->guc;
 
diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index e5c37b5..86a518f 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -218,3 +218,11 @@ int intel_guc_runtime_resume(struct intel_guc *guc)
 
 	return 0;
 }
+
+void intel_guc_cleanup(struct intel_guc *guc)
+{
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
+	if (i915.enable_guc_submission)
+		i915_guc_submission_cleanup(dev_priv);
+}
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 1429d34..dfe0638 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -133,6 +133,7 @@ struct intel_guc {
 int intel_guc_sample_forcewake(struct intel_guc *guc);
 int intel_guc_runtime_suspend(struct intel_guc *guc);
 int intel_guc_runtime_resume(struct intel_guc *guc);
+void intel_guc_cleanup(struct intel_guc *guc);
 
 static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
 {
@@ -162,7 +163,7 @@ static inline void intel_guc_init_early(struct intel_guc *guc)
 int i915_guc_submission_init(struct drm_i915_private *dev_priv);
 int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
 void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
+void i915_guc_submission_cleanup(struct drm_i915_private *dev_priv);
 struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);
 
 /* intel_guc_log.c */
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index a5b4f4d..9ecf0e0 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -382,7 +382,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	guc_capture_load_err_log(guc);
 err_submission:
 	if (i915.enable_guc_submission)
-		i915_guc_submission_fini(dev_priv);
+		i915_guc_submission_cleanup(dev_priv);
 err_guc:
 	i915_ggtt_disable_guc(dev_priv);
 
@@ -403,21 +403,14 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
-void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
+void intel_uc_cleanup(struct drm_i915_private *dev_priv)
 {
-	guc_free_load_err_log(&dev_priv->guc);
-
 	if (!i915.enable_guc_loading)
 		return;
 
-	guc_disable_communication(&dev_priv->guc);
-
-	if (i915.enable_guc_submission) {
-		gen9_disable_guc_interrupts(dev_priv);
-		i915_guc_submission_fini(dev_priv);
-	}
+	guc_free_load_err_log(&dev_priv->guc);
 
-	i915_ggtt_disable_guc(dev_priv);
+	intel_guc_cleanup(&dev_priv->guc);
 }
 
 int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h
index d0c2a27..0801e6a 100644
--- a/drivers/gpu/drm/i915/intel_uc.h
+++ b/drivers/gpu/drm/i915/intel_uc.h
@@ -64,7 +64,7 @@ static inline const char *intel_uc_fw_type_repr(enum intel_uc_fw_type type)
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
 void intel_uc_init_mmio(struct drm_i915_private *dev_priv);
 int intel_uc_init_hw(struct drm_i915_private *dev_priv);
-void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
+void intel_uc_cleanup(struct drm_i915_private *dev_priv);
 int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv);
 int intel_uc_runtime_resume(struct drm_i915_private *dev_priv);
 int intel_uc_suspend(struct drm_i915_private *dev_priv);
-- 
1.9.1

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

  parent reply	other threads:[~2017-09-19 17:24 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-19 17:27 [PATCH 00/14] GuC code restructuring and fixes Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 01/14] drm/i915/guc: Pass intel_guc struct as parameter to intel_guc_wopcm_size Sagar Arun Kamble
2017-09-19 20:17   ` Michal Wajdeczko
2017-09-20 11:13     ` Kamble, Sagar A
2017-09-19 17:27 ` [PATCH 02/14] drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior to uc init Sagar Arun Kamble
2017-09-19 20:28   ` Michal Wajdeczko
2017-09-20 10:45     ` Kamble, Sagar A
2017-09-19 17:27 ` [PATCH 03/14] drm/i915/guc: Create intel_guc_init_early Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 04/14] drm/i915: Create intel_guc.h, intel_huc.h and intel_uc_common.h Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 05/14] drm/i915/guc: Move GuC specific functionality from intel_uc.c to intel_guc.c Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 06/14] drm/i915: Create uc runtime and system suspend/resume helpers Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 07/14] drm/i915/guc: Update prototype/name of GuC suspend/resume fns and move to intel_guc.c Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 08/14] drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication across RPM suspend/resume Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 09/14] drm/i915/guc: Update suspend functionality in intel_uc_suspend path Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 10/14] drm/i915/guc: Reuse GuC suspend functionality in reset path Sagar Arun Kamble
2017-09-19 17:27 ` Sagar Arun Kamble [this message]
2017-09-19 17:27 ` [PATCH 12/14] drm/i915/guc: Remove i915_guc_log_unregister Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 13/14] drm/i915/guc: Enable default/critical logging in GuC by default from GuC v9 Sagar Arun Kamble
2017-09-19 17:27 ` [PATCH 14/14] drm/i915: Reorganize HuC authentication Sagar Arun Kamble
2017-09-19 20:15 ` [PATCH 00/14] GuC code restructuring and fixes Michal Wajdeczko
2017-09-20 10:42   ` Kamble, Sagar A
2017-09-19 20:26 ` ✓ Fi.CI.BAT: success for GuC code restructuring and fixes (rev3) Patchwork
2017-09-20  0:11 ` ✗ 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=1505842071-12787-12-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.