[PATCH 4/9] drm/i915/guc: Pass intel_guc struct parameter to GuC interrupts functions
Sagar Arun Kamble
sagar.a.kamble at intel.com
Fri Oct 13 11:28:45 UTC 2017
GuC interrupts handling functions are GuC specific functions hence update
the parameter from dev_priv to intel_guc struct.
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/i915_irq.c | 2 +-
drivers/gpu/drm/i915/intel_guc.c | 22 +++++++++++++++-------
drivers/gpu/drm/i915/intel_guc.h | 8 ++++----
drivers/gpu/drm/i915/intel_guc_log.c | 20 +++++++++++---------
drivers/gpu/drm/i915/intel_uc.c | 8 ++++----
5 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 02b1c23..1765e6a 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1441,7 +1441,7 @@ static void gen8_gt_irq_handler(struct drm_i915_private *dev_priv,
gen6_rps_irq_handler(dev_priv, gt_iir[2]);
if (gt_iir[2] & dev_priv->pm_guc_events)
- intel_guc_irq_handler(dev_priv, gt_iir[2]);
+ intel_guc_irq_handler(&dev_priv->guc, gt_iir[2]);
}
static bool bxt_port_hotplug_long_detect(enum port port, u32 val)
diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index 8a116d4..066b0ef 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -181,7 +181,7 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)
if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
return 0;
- intel_disable_guc_interrupts(dev_priv);
+ intel_disable_guc_interrupts(guc);
ctx = dev_priv->kernel_context;
@@ -209,7 +209,7 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)
return 0;
if (i915_modparams.guc_log_level >= 0)
- intel_enable_guc_interrupts(dev_priv);
+ intel_enable_guc_interrupts(guc);
ctx = dev_priv->kernel_context;
@@ -264,15 +264,19 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)
return vma;
}
-void intel_reset_guc_interrupts(struct drm_i915_private *dev_priv)
+void intel_reset_guc_interrupts(struct intel_guc *guc)
{
+ struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
spin_lock_irq(&dev_priv->irq_lock);
gen6_reset_pm_iir(dev_priv, dev_priv->pm_guc_events);
spin_unlock_irq(&dev_priv->irq_lock);
}
-void intel_enable_guc_interrupts(struct drm_i915_private *dev_priv)
+void intel_enable_guc_interrupts(struct intel_guc *guc)
{
+ struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
spin_lock_irq(&dev_priv->irq_lock);
if (!dev_priv->guc.interrupts_enabled) {
WARN_ON_ONCE(I915_READ(gen6_pm_iir(dev_priv)) &
@@ -283,8 +287,10 @@ void intel_enable_guc_interrupts(struct drm_i915_private *dev_priv)
spin_unlock_irq(&dev_priv->irq_lock);
}
-void intel_disable_guc_interrupts(struct drm_i915_private *dev_priv)
+void intel_disable_guc_interrupts(struct intel_guc *guc)
{
+ struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
spin_lock_irq(&dev_priv->irq_lock);
dev_priv->guc.interrupts_enabled = false;
@@ -293,11 +299,13 @@ void intel_disable_guc_interrupts(struct drm_i915_private *dev_priv)
spin_unlock_irq(&dev_priv->irq_lock);
synchronize_irq(dev_priv->drm.irq);
- intel_reset_guc_interrupts(dev_priv);
+ intel_reset_guc_interrupts(guc);
}
-void intel_guc_irq_handler(struct drm_i915_private *dev_priv, u32 gt_iir)
+void intel_guc_irq_handler(struct intel_guc *guc, u32 gt_iir)
{
+ struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
if (gt_iir & GEN9_GUC_TO_HOST_INT_EVENT) {
/* Sample the log buffer flush related bits & clear them out now
* itself from the message identity register to minimize the
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 689fc0e..c7171fd 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -116,10 +116,10 @@ static inline bool i915_guc_submission_enabled(struct intel_guc *guc)
int intel_guc_suspend(struct drm_i915_private *dev_priv);
int intel_guc_resume(struct drm_i915_private *dev_priv);
struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);
-void intel_reset_guc_interrupts(struct drm_i915_private *dev_priv);
-void intel_enable_guc_interrupts(struct drm_i915_private *dev_priv);
-void intel_disable_guc_interrupts(struct drm_i915_private *dev_priv);
-void intel_guc_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir);
+void intel_reset_guc_interrupts(struct intel_guc *guc);
+void intel_enable_guc_interrupts(struct intel_guc *guc);
+void intel_disable_guc_interrupts(struct intel_guc *guc);
+void intel_guc_irq_handler(struct intel_guc *guc, u32 pm_iir);
int intel_guc_select_fw(struct intel_guc *guc);
int intel_guc_init_hw(struct intel_guc *guc);
diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
index adb916e..e01663e 100644
--- a/drivers/gpu/drm/i915/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/intel_guc_log.c
@@ -503,14 +503,12 @@ static void guc_log_capture_logs(struct intel_guc *guc)
static void guc_flush_logs(struct intel_guc *guc)
{
- struct drm_i915_private *dev_priv = guc_to_i915(guc);
-
if (!i915_guc_submission_enabled(guc) ||
i915_modparams.guc_log_level < 0)
return;
/* First disable the interrupts, will be renabled afterwards */
- intel_disable_guc_interrupts(dev_priv);
+ intel_disable_guc_interrupts(guc);
/* Before initiating the forceful flush, wait for any pending/ongoing
* flush to complete otherwise forceful flush may not actually happen.
@@ -628,7 +626,7 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)
}
/* GuC logging is currently the only user of Guc2Host interrupts */
- intel_enable_guc_interrupts(dev_priv);
+ intel_enable_guc_interrupts(guc);
} else {
/* Once logging is disabled, GuC won't generate logs & send an
* interrupt. But there could be some data in the log buffer
@@ -646,23 +644,27 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)
void i915_guc_log_register(struct drm_i915_private *dev_priv)
{
- if (!i915_guc_submission_enabled(&dev_priv->guc) ||
+ struct intel_guc *guc = &dev_priv->guc;
+
+ if (!i915_guc_submission_enabled(guc) ||
i915_modparams.guc_log_level < 0)
return;
mutex_lock(&dev_priv->drm.struct_mutex);
- guc_log_late_setup(&dev_priv->guc);
+ guc_log_late_setup(guc);
mutex_unlock(&dev_priv->drm.struct_mutex);
}
void i915_guc_log_unregister(struct drm_i915_private *dev_priv)
{
- if (!i915_guc_submission_enabled(&dev_priv->guc))
+ struct intel_guc *guc = &dev_priv->guc;
+
+ if (!i915_guc_submission_enabled(guc))
return;
mutex_lock(&dev_priv->drm.struct_mutex);
/* GuC logging is currently the only user of Guc2Host interrupts */
- intel_disable_guc_interrupts(dev_priv);
- guc_log_runtime_destroy(&dev_priv->guc);
+ intel_disable_guc_interrupts(guc);
+ guc_log_runtime_destroy(guc);
mutex_unlock(&dev_priv->drm.struct_mutex);
}
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 4a56506..e3a5619 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -158,7 +158,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
return 0;
guc_disable_communication(guc);
- intel_reset_guc_interrupts(dev_priv);
+ intel_reset_guc_interrupts(guc);
/* We need to notify the guc whenever we change the GGTT */
i915_ggtt_enable_guc(dev_priv);
@@ -214,7 +214,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
intel_huc_auth(&dev_priv->huc);
if (i915_guc_submission_initialized(guc)) {
if (i915_modparams.guc_log_level >= 0)
- intel_enable_guc_interrupts(dev_priv);
+ intel_enable_guc_interrupts(guc);
ret = i915_guc_submission_enable(dev_priv);
@@ -235,7 +235,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
*/
err_interrupts:
guc_disable_communication(guc);
- intel_disable_guc_interrupts(dev_priv);
+ intel_disable_guc_interrupts(guc);
err_log_capture:
guc_capture_load_err_log(guc);
err_submission:
@@ -275,7 +275,7 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
guc_disable_communication(guc);
if (i915_guc_submission_enabled(guc))
- intel_disable_guc_interrupts(dev_priv);
+ intel_disable_guc_interrupts(guc);
i915_guc_submission_fini(dev_priv);
i915_ggtt_disable_guc(dev_priv);
--
1.9.1
More information about the Intel-gfx-trybot
mailing list