On Thu, 2013-12-19 at 11:54 -0200, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
>
> To solve a chicken-and-egg problem. Currently when we get/put
> forcewake we also get/put runtime PM and this works fine because the
> runtime PM code doesn't need forcewake. But we're going to merge PC8
> and runtime PM into a single feature, and the PC8 code (the LCPLL
> code) does need the forcewake, so that specific piece of code needs to
> call the _no_rpm version so it doesn't try to get runtime PM in the
> code that gets runtime PM.
>
> For now the new functions are unused, we'll use them on the patch that
> merges PC8 with runtime PM.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 4 ++++
> drivers/gpu/drm/i915/intel_uncore.c | 30 ++++++++++++++++++++----------
> 2 files changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index cc8afff..7f8ec08 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2533,6 +2533,10 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,
> */
> void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_engine);
> void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_engine);
> +void gen6_gt_force_wake_get_no_rpm(struct drm_i915_private *dev_priv,
> + int fw_engine);
> +void gen6_gt_force_wake_put_no_rpm(struct drm_i915_private *dev_priv,
> + int fw_engine);
>
> int sandybridge_pcode_read(struct drm_i915_private *dev_priv, u8 mbox, u32 *val);
> int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u8 mbox, u32 val);
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 646fecf..6118d2c 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -368,15 +368,11 @@ void intel_uncore_sanitize(struct drm_device *dev)
> * be called at the beginning of the sequence followed by a call to
> * gen6_gt_force_wake_put() at the end of the sequence.
> */
> -void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_engine)
> +void gen6_gt_force_wake_get_no_rpm(struct drm_i915_private *dev_priv,
> + int fw_engine)
> {
> unsigned long irqflags;
>
> - if (!dev_priv->uncore.funcs.force_wake_get)
> - return;
> -
> - intel_runtime_pm_get(dev_priv);
> -
> /* Redirect to VLV specific routine */
> if (IS_VALLEYVIEW(dev_priv->dev))
> return vlv_force_wake_get(dev_priv, fw_engine);
> @@ -387,16 +383,23 @@ void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_engine)
> spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
> }
>
> +void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_engine)
> +{
> + if (!dev_priv->uncore.funcs.force_wake_get)
> + return;
> +
> + intel_runtime_pm_get(dev_priv);
> + gen6_gt_force_wake_get_no_rpm(dev_priv, fw_engine);
> +}
> +
> /*
> * see gen6_gt_force_wake_get()
> */
> -void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_engine)
> +void gen6_gt_force_wake_put_no_rpm(struct drm_i915_private *dev_priv,
> + int fw_engine)
> {
> unsigned long irqflags;
>
> - if (!dev_priv->uncore.funcs.force_wake_put)
> - return;
> -
> /* Redirect to VLV specific routine */
> if (IS_VALLEYVIEW(dev_priv->dev))
> return vlv_force_wake_put(dev_priv, fw_engine);
> @@ -410,7 +413,14 @@ void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_engine)
> 1);
> }
> spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
> +}
> +
> +void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_engine)
> +{
> + if (!dev_priv->uncore.funcs.force_wake_put)
> + return;
>
> + gen6_gt_force_wake_put_no_rpm(dev_priv, fw_engine);
> intel_runtime_pm_put(dev_priv);
> }
>
Attachment:
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
