diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 7 | 
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7307974d29e..8f0db8cf6ce 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 {  |