Re: [PATCH 2/8] drm/i915: Assert that runtime pm is active on user fw access

Chris Wilson
2014-12-11T11:53:31Z

On Fri, Dec 12, 2014 at 05:09:26PM +0530, Deepak S wrote:
> >@@ -564,17 +542,20 @@ void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_engine)
> > intel_runtime_pm_get(dev_priv);
>
> I think we need to remove "intel_runtime_pm_get" here?
> I see runtime_put is removed from "gen6_gt_force_wake_put"
>
> >- /* Redirect to Gen9 specific routine */
> >- if (IS_GEN9(dev_priv->dev))
> >- return gen9_force_wake_get(dev_priv, fw_engine);
> >-
> >- /* Redirect to VLV specific routine */
> >- if (IS_VALLEYVIEW(dev_priv->dev))
> >- return vlv_force_wake_get(dev_priv, fw_engine);
> >+ WARN_ON(!pm_runtime_active(&dev_priv->dev->pdev->dev));

Indeed, the purpose of this patch was to remove the rpm_get() and
replace it with this WARN_ON (and so make sure that all call paths here
already held the rpm reference). Something went wrong in the rebase I
hope.
-Chris

--
Chris Wilson, Intel Open Source Technology Centre