Re: Intel Haswell kernel warning (3.11.2)

[Wakko Warner]

 Please keep me in CC.

CCing Borislav Petkov <bp@xxxxxxxxx>, intel-gfx@xxxxxxxxxxxxxxxxxxxxx,
dri-devel@xxxxxxxxxxxxxxxxxxxxx as they were on another part of this thread.

Chris Wilson wrote:
> > > I receive a warning in drivers/gpu/drm/i915/intel_display.c:3869.  This
> > > happens when I'm on a console, the screen has gone into power save and I
> > > press a key to wake it up.
> > > 
> > > Kernel is Vanilla 3.11.2.
> 
> Try,
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index bd3e115..dacde4e 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4043,8 +4043,6 @@ static void intel_connector_check_state(struct intel_connector *connector)
>   * consider. */
>  void intel_connector_dpms(struct drm_connector *connector, int mode)
>  {
> -       struct intel_encoder *encoder = intel_attached_encoder(connector);
> -
>         /* All the simple cases only support two dpms states. */
>         if (mode != DRM_MODE_DPMS_ON)
>                 mode = DRM_MODE_DPMS_OFF;
> @@ -4055,10 +4053,8 @@ void intel_connector_dpms(struct drm_connector *connector, int mode)
>         connector->dpms = mode;
>  
>         /* Only need to change hw state when actually enabled */
> -       if (encoder->base.crtc)
> -               intel_encoder_dpms(encoder, mode);
> -       else
> -               WARN_ON(encoder->connectors_active != false);
> +       if (connector->encoder)
> +               intel_encoder_dpms(to_intel_encoder(connector->encoder), mode);
>  
>         intel_modeset_check_state(connector->dev);
>  }

Manually appied to 3.11.2.  It doesn't give me a warning now and I can go
back to the VT where X is running (I forgot to mention that detail in the
original message I think).

-- 
 Microsoft has beaten Volkswagen's world record.  Volkswagen only created 22
 million bugs.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/