2013/9/16 <ville.syrjala@xxxxxxxxxxxxxxx>: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > i915_restore_state() -> i915_restore_display() will attempt to > re-disable VGA during resume. So the power well needs to be powered on > before that. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Needs a rebase, but looks correct. > --- > drivers/gpu/drm/i915/i915_drv.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index cd5a66d..fdf3eef 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -581,6 +581,8 @@ static int __i915_drm_thaw(struct drm_device *dev) > struct drm_i915_private *dev_priv = dev->dev_private; > int error = 0; > > + intel_init_power_well(dev); > + > i915_restore_state(dev); > intel_opregion_setup(dev); > > @@ -596,8 +598,6 @@ static int __i915_drm_thaw(struct drm_device *dev) > /* We need working interrupts for modeset enabling ... */ > drm_irq_install(dev); > > - intel_init_power_well(dev); > - > intel_modeset_init_hw(dev); > > drm_modeset_lock_all(dev); > -- > 1.8.1.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
