[Intel-gfx] [PATCH 11/11] drm/i915: Drop explicit plane restoration during resume

[Paulo Zanoni]

2013/9/20 Paulo Zanoni <przanoni at gmail.com>:
> 2013/9/20 Ville Syrjälä <ville.syrjala at linux.intel.com>:
>> On Thu, Sep 19, 2013 at 07:24:19PM -0300, Paulo Zanoni wrote:
>>> 2013/9/16  <ville.syrjala at linux.intel.com>:
>>> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>>> >
>>> > We already restore planes during the modeset operation, so no need to do
>>> > another loop over the planes and try to restore them again.
>>>
>>> What about the call from intel_lid_notify()? It helps if you explain
>>> on the commit message why/how we already restore things.
>>
>> Sorry, I figured it's more or less obvious:
>>
>> for each crtc
>>  -> __intel_set_mode
>>    -> .crtc_enable
>>      -> intel_enable_planes
>>        -> for each plane on crtc
>>          -> intel_plane_restore
>
> But that still doesn't explain the case where intel_lid_notify calls
> setup_hw_state directly.
> Perhaps maybe I'm just confused.

Yeah, I was totally confused.

Now that you resent patch 6, for patches 6-11: Reviewed-by: Paulo
Zanoni <paulo.r.zanoni at intel.com>
(Daniel will have to rebase some things)

>
>>
>>>
>>>
>>> >
>>> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
>>> > ---
>>> >  drivers/gpu/drm/i915/intel_display.c | 3 ---
>>> >  1 file changed, 3 deletions(-)
>>> >
>>> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>>> > index c9093bb..37a470f 100644
>>> > --- a/drivers/gpu/drm/i915/intel_display.c
>>> > +++ b/drivers/gpu/drm/i915/intel_display.c
>>> > @@ -10641,7 +10641,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
>>> >  {
>>> >         struct drm_i915_private *dev_priv = dev->dev_private;
>>> >         enum pipe pipe;
>>> > -       struct drm_plane *plane;
>>> >         struct intel_crtc *crtc;
>>> >         struct intel_encoder *encoder;
>>> >         int i;
>>> > @@ -10702,8 +10701,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
>>> >                         __intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y,
>>> >                                          crtc->fb);
>>> >                 }
>>> > -               list_for_each_entry(plane, &dev->mode_config.plane_list, head)
>>> > -                       intel_plane_restore(plane);
>>> >         } else {
>>> >                 intel_modeset_update_staged_output_state(dev);
>>> >         }
>>> > --
>>> > 1.8.1.5
>>> >
>>> > _______________________________________________
>>> > Intel-gfx mailing list
>>> > Intel-gfx at lists.freedesktop.org
>>> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>>
>>>
>>>
>>> --
>>> Paulo Zanoni
>>
>> --
>> Ville Syrjälä
>> Intel OTC
>
>
>
> --
> Paulo Zanoni



-- 
Paulo Zanoni