diff options
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c9882e816af8..de6edd0f6205 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -9252,8 +9252,7 @@ check_crtc_state(struct drm_device *dev) | |||
9252 | enum pipe pipe; | 9252 | enum pipe pipe; |
9253 | if (encoder->base.crtc != &crtc->base) | 9253 | if (encoder->base.crtc != &crtc->base) |
9254 | continue; | 9254 | continue; |
9255 | if (encoder->get_config && | 9255 | if (encoder->get_hw_state(encoder, &pipe)) |
9256 | encoder->get_hw_state(encoder, &pipe)) | ||
9257 | encoder->get_config(encoder, &pipe_config); | 9256 | encoder->get_config(encoder, &pipe_config); |
9258 | } | 9257 | } |
9259 | 9258 | ||
@@ -10913,8 +10912,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) | |||
10913 | if (encoder->get_hw_state(encoder, &pipe)) { | 10912 | if (encoder->get_hw_state(encoder, &pipe)) { |
10914 | crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]); | 10913 | crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]); |
10915 | encoder->base.crtc = &crtc->base; | 10914 | encoder->base.crtc = &crtc->base; |
10916 | if (encoder->get_config) | 10915 | encoder->get_config(encoder, &crtc->config); |
10917 | encoder->get_config(encoder, &crtc->config); | ||
10918 | } else { | 10916 | } else { |
10919 | encoder->base.crtc = NULL; | 10917 | encoder->base.crtc = NULL; |
10920 | } | 10918 | } |