2013/9/16 <ville.syrjala@xxxxxxxxxxxxxxx>:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> The VGA plane needs to be disabled before we start doing any
> modeset operations on resume.
>
> This should also guarantee that the power well will be enabled
> when we call i915_redisable_vga() since it gets explicitly powered on
> during resume, and will get powered back off during the modeset
> operation if no longer needed.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8162cd1..c9093bb 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10689,6 +10689,8 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
> }
>
> if (force_restore) {
> + i915_redisable_vga(dev);
> +
> /*
> * We need to use raw interfaces for restoring state to avoid
> * checking (bogus) intermediate states.
> @@ -10702,8 +10704,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
> }
> list_for_each_entry(plane, &dev->mode_config.plane_list, head)
> intel_plane_restore(plane);
> -
> - i915_redisable_vga(dev);
> } else {
> intel_modeset_update_staged_output_state(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
