| Message ID | 20130326132527.312d722f@jbarnes-desktop (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 26, 2013 at 01:25:27PM -0700, Jesse Barnes wrote: > commit 79dd6a5bd6603b9d76b992d59819c3aec50e6c33 > Author: Jesse Barnes <jbarnes@virtuousgeek.org> > Date: Fri Feb 15 12:37:40 2013 -0800 > > drm/i915: restore sprite state when forcing a config restore v2 > > Needed for VT switchless resume. > > v2: cursor state is now handled correctly in crtc_enable (Daniel) > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Hand-frobbing patches ... tsk. Applied all for patches of this series, with a mental note that we have some debt to fix (from way yonder) in this area around plane/cursor restoring and dpms handling. Next who wanders beyond, expect to get random-volunteered to improve things ;-) Cheers, Daniel
On Tue, 26 Mar 2013 21:46:03 +0100 Daniel Vetter <daniel@ffwll.ch> wrote: > On Tue, Mar 26, 2013 at 01:25:27PM -0700, Jesse Barnes wrote: > > commit 79dd6a5bd6603b9d76b992d59819c3aec50e6c33 > > Author: Jesse Barnes <jbarnes@virtuousgeek.org> > > Date: Fri Feb 15 12:37:40 2013 -0800 > > > > drm/i915: restore sprite state when forcing a config restore v2 > > > > Needed for VT switchless resume. > > > > v2: cursor state is now handled correctly in crtc_enable (Daniel) > > > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > Hand-frobbing patches ... tsk. Applied all for patches of this series, > with a mental note that we have some debt to fix (from way yonder) in this > area around plane/cursor restoring and dpms handling. Next who wanders > beyond, expect to get random-volunteered to improve things ;-) Oh I didn't edit it inline in the email. :) I just did a format-patch and sent it manually since I had trouble getting git send-email to cooperate (I've since learned the proper way).
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7307974..8f0db8c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9106,6 +9106,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, struct drm_i915_private *dev_priv = dev->dev_private; enum pipe pipe; u32 tmp; + struct drm_plane *plane; struct intel_crtc *crtc; struct intel_encoder *encoder; struct intel_connector *connector; @@ -9210,8 +9211,12 @@ setup_pipes: if (force_restore) { for_each_pipe(pipe) { - intel_crtc_restore_mode(dev_priv->pipe_to_crtc_mapping[pipe]); + struct drm_crtc *crtc = + dev_priv->pipe_to_crtc_mapping[pipe]; + intel_crtc_restore_mode(crtc); } + list_for_each_entry(plane, &dev->mode_config.plane_list, head) + intel_plane_restore(plane); i915_redisable_vga(dev); } else {
commit 79dd6a5bd6603b9d76b992d59819c3aec50e6c33 Author: Jesse Barnes <jbarnes@virtuousgeek.org> Date: Fri Feb 15 12:37:40 2013 -0800 drm/i915: restore sprite state when forcing a config restore v2 Needed for VT switchless resume. v2: cursor state is now handled correctly in crtc_enable (Daniel) Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>