[Intel-gfx] [PATCH 2/6] drm/i915: fix SDEIMR assertion when disabling LCPLL

[Rodrigo Vivi]

ok, if we don't care about this hotplug bits state I liked the simplification.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at gmail.com>

On Mon, Aug 19, 2013 at 1:18 PM, Paulo Zanoni <przanoni at gmail.com> wrote:
> From: Paulo Zanoni <paulo.r.zanoni at intel.com>
>
> This was causing WARNs in one machine, so instead of trying to guess
> exactly which hotplug bits should exist, just do the test on the
> non-HPD bits. We don't care about the state of the hotplug bits, we
> just care about the others, that need to be 1.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8c63d8e..b9a4d8b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5930,11 +5930,7 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv)
>         struct intel_ddi_plls *plls = &dev_priv->ddi_plls;
>         struct intel_crtc *crtc;
>         unsigned long irqflags;
> -       uint32_t val, pch_hpd_mask;
> -
> -       pch_hpd_mask = SDE_PORTB_HOTPLUG_CPT | SDE_PORTC_HOTPLUG_CPT;
> -       if (!(dev_priv->pch_id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE))
> -               pch_hpd_mask |= SDE_PORTD_HOTPLUG_CPT | SDE_CRT_HOTPLUG_CPT;
> +       uint32_t val;
>
>         list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head)
>                 WARN(crtc->base.enabled, "CRTC for pipe %c enabled\n",
> @@ -5960,7 +5956,7 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv)
>         WARN((val & ~DE_PCH_EVENT_IVB) != val,
>              "Unexpected DEIMR bits enabled: 0x%x\n", val);
>         val = I915_READ(SDEIMR);
> -       WARN((val & ~pch_hpd_mask) != val,
> +       WARN((val | SDE_HOTPLUG_MASK_CPT) != 0xffffffff,
>              "Unexpected SDEIMR bits enabled: 0x%x\n", val);
>         spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>  }
> --
> 1.8.1.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br