diff mbox

[12/11] drm/i915: Reinitialize HPD after runtime D3

Message ID 1440008025-4334-1-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä Aug. 19, 2015, 6:13 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Runtime suspends disabled all interrupts, so in order to get them back
fully we need to also do the HPD irq setup on runtime resume. Except
on VLV/CHV where the display interrupt initialization is part of the
display power well powerup.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Paulo Zanoni Aug. 27, 2015, 8:36 p.m. UTC | #1 
2015-08-19 15:13 GMT-03:00  <ville.syrjala@linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Runtime suspends disabled all interrupts, so in order to get them back
> fully we need to also do the HPD irq setup on runtime resume. Except
> on VLV/CHV where the display interrupt initialization is part of the
> display power well powerup.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 1d88745..4bbd3b7 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1549,6 +1549,15 @@ static int intel_runtime_resume(struct device *device)
>         gen6_update_ring_freq(dev);
>
>         intel_runtime_pm_enable_interrupts(dev_priv);
> +
> +       /*
> +        * On VLV/CHV display interrupts are part of the display
> +        * power well, so hpd is reinitialized from there. For
> +        * everyone else do it here.
> +        */
> +       if (!IS_VALLEYVIEW(dev_priv))
> +               intel_hpd_init(dev_priv);

Maybe we should put this inside intel_runtime_pm_enable_interrupts()?
Either way: Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> +
>         intel_enable_gt_powersave(dev);
>
>         if (ret)
> --
> 2.4.6
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 1d88745..4bbd3b7 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1549,6 +1549,15 @@  static int intel_runtime_resume(struct device *device)
 	gen6_update_ring_freq(dev);
 
 	intel_runtime_pm_enable_interrupts(dev_priv);
+
+	/*
+	 * On VLV/CHV display interrupts are part of the display
+	 * power well, so hpd is reinitialized from there. For
+	 * everyone else do it here.
+	 */
+	if (!IS_VALLEYVIEW(dev_priv))
+		intel_hpd_init(dev_priv);
+
 	intel_enable_gt_powersave(dev);
 
 	if (ret)