[Intel-gfx] [PATCH v3 03/12] drm/i915/guc: Pass intel_guc struct parameter to GuC interrupts functions
Michal Wajdeczko
michal.wajdeczko at intel.com
Thu Jan 4 17:22:33 UTC 2018
On Thu, 04 Jan 2018 17:21:45 +0100, Sagar Arun Kamble
<sagar.a.kamble at intel.com> wrote:
> GuC interrupts handling functions are GuC specific functions hence update
> the parameter from dev_priv to intel_guc struct.
>
> v2-v3: Rebase.
>
> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at 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 | 8 +++-----
> drivers/gpu/drm/i915/intel_uc.c | 8 ++++----
> 5 files changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c
> b/drivers/gpu/drm/i915/i915_irq.c
> index 3f4eff9..a1ae057 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1447,7 +1447,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 e95ff2d..14bf508d 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -400,7 +400,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);
Hmm, if we disable irq here, then we might have problems with
sending this message to GuC if we use CTB as comm mechanism...
> data[0] = INTEL_GUC_ACTION_ENTER_S_STATE;
> /* any value greater than GUC_POWER_D0 */
> @@ -446,7 +446,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);
> data[0] = INTEL_GUC_ACTION_EXIT_S_STATE;
> data[1] = GUC_POWER_D0;
> @@ -508,15 +508,19 @@ u32 intel_guc_wopcm_size(struct drm_i915_private
> *dev_priv)
> return wopcm_size;
> }
> -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) {
Just spotted:
as we have "guc" try to use "guc->" instead of "dev_priv->guc."
> WARN_ON_ONCE(I915_READ(gen6_pm_iir(dev_priv)) &
> @@ -527,8 +531,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;
same here (and possibly in other places too)
> @@ -537,11 +543,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 c37d34d..49f33b9 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -131,9 +131,9 @@ static inline u32 guc_ggtt_offset(struct i915_vma
> *vma)
> int intel_guc_resume(struct drm_i915_private *dev_priv);
> struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32
> size);
> u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);
> -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);
> #endif
> diff --git a/drivers/gpu/drm/i915/intel_guc_log.c
> b/drivers/gpu/drm/i915/intel_guc_log.c
> index 5cd68f6..59a9021 100644
> --- a/drivers/gpu/drm/i915/intel_guc_log.c
> +++ b/drivers/gpu/drm/i915/intel_guc_log.c
> @@ -480,14 +480,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 (!USES_GUC_SUBMISSION(dev_priv) ||
> (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.
> @@ -605,7 +603,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
> @@ -639,7 +637,7 @@ void i915_guc_log_unregister(struct drm_i915_private
> *dev_priv)
> mutex_lock(&dev_priv->drm.struct_mutex);
> /* GuC logging is currently the only user of Guc2Host interrupts */
> - intel_disable_guc_interrupts(dev_priv);
> + intel_disable_guc_interrupts(&dev_priv->guc);
> guc_log_runtime_destroy(&dev_priv->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 8e58e5a..f82453b 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -271,7 +271,7 @@ int intel_uc_init_hw(struct drm_i915_private
> *dev_priv)
> GEM_BUG_ON(!HAS_GUC(dev_priv));
> guc_disable_communication(guc);
> - intel_reset_guc_interrupts(dev_priv);
> + intel_reset_guc_interrupts(guc);
> /* init WOPCM */
> I915_WRITE(GUC_WOPCM_SIZE, intel_guc_wopcm_size(dev_priv));
> @@ -325,7 +325,7 @@ int intel_uc_init_hw(struct drm_i915_private
> *dev_priv)
> if (USES_GUC_SUBMISSION(dev_priv)) {
> if (i915_modparams.guc_log_level >= 0)
> - intel_enable_guc_interrupts(dev_priv);
> + intel_enable_guc_interrupts(guc);
> ret = intel_guc_submission_enable(guc);
> if (ret)
> @@ -345,7 +345,7 @@ int intel_uc_init_hw(struct drm_i915_private
> *dev_priv)
> * We've failed to load the firmware :(
> */
> err_interrupts:
> - intel_disable_guc_interrupts(dev_priv);
> + intel_disable_guc_interrupts(guc);
> err_communication:
> guc_disable_communication(guc);
> err_log_capture:
> @@ -379,5 +379,5 @@ void intel_uc_fini_hw(struct drm_i915_private
> *dev_priv)
> guc_disable_communication(guc);
> if (USES_GUC_SUBMISSION(dev_priv))
> - intel_disable_guc_interrupts(dev_priv);
> + intel_disable_guc_interrupts(guc);
> }
More information about the Intel-gfx
mailing list