[Intel-gfx] [PATCH 1/2] drm/i915: Hold pc8 lock around toggling pc8.gpu_idle

[Paulo Zanoni]

2013/10/10 Chris Wilson <chris at chris-wilson.co.uk>:
> We need to hold the pc8 lock around toggling the value of gpu_idle.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>

Should we Cc:stable ?

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

I wonder if we need to rename hsw_enable_package_c8 and
__hsw_enable_package_c8 since we're spreading the usage of the "__"
function. Suggestions/patches welcome :)

> ---
>  drivers/gpu/drm/i915/intel_display.c |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 5ce1558..4fa1fd5 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6546,18 +6546,22 @@ done:
>
>  static void hsw_package_c8_gpu_idle(struct drm_i915_private *dev_priv)
>  {
> +       mutex_lock(&dev_priv->pc8.lock);
>         if (!dev_priv->pc8.gpu_idle) {
>                 dev_priv->pc8.gpu_idle = true;
> -               hsw_enable_package_c8(dev_priv);
> +               __hsw_enable_package_c8(dev_priv);
>         }
> +       mutex_unlock(&dev_priv->pc8.lock);
>  }
>
>  static void hsw_package_c8_gpu_busy(struct drm_i915_private *dev_priv)
>  {
> +       mutex_lock(&dev_priv->pc8.lock);
>         if (dev_priv->pc8.gpu_idle) {
>                 dev_priv->pc8.gpu_idle = false;
> -               hsw_disable_package_c8(dev_priv);
> +               __hsw_disable_package_c8(dev_priv);
>         }
> +       mutex_unlock(&dev_priv->pc8.lock);
>  }
>
>  static void haswell_modeset_global_resources(struct drm_device *dev)
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni