diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 22524cb6903b..26a0a570f92e 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c | |||
@@ -924,7 +924,7 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc) | |||
924 | struct drm_i915_private *dev_priv = crtc->dev->dev_private; | 924 | struct drm_i915_private *dev_priv = crtc->dev->dev_private; |
925 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | 925 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); |
926 | struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); | 926 | struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); |
927 | enum transcoder cpu_transcoder = intel_crtc->cpu_transcoder; | 927 | enum transcoder cpu_transcoder = intel_crtc->config.cpu_transcoder; |
928 | int type = intel_encoder->type; | 928 | int type = intel_encoder->type; |
929 | uint32_t temp; | 929 | uint32_t temp; |
930 | 930 | ||
@@ -958,7 +958,7 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) | |||
958 | struct drm_encoder *encoder = &intel_encoder->base; | 958 | struct drm_encoder *encoder = &intel_encoder->base; |
959 | struct drm_i915_private *dev_priv = crtc->dev->dev_private; | 959 | struct drm_i915_private *dev_priv = crtc->dev->dev_private; |
960 | enum pipe pipe = intel_crtc->pipe; | 960 | enum pipe pipe = intel_crtc->pipe; |
961 | enum transcoder cpu_transcoder = intel_crtc->cpu_transcoder; | 961 | enum transcoder cpu_transcoder = intel_crtc->config.cpu_transcoder; |
962 | enum port port = intel_ddi_get_encoder_port(intel_encoder); | 962 | enum port port = intel_ddi_get_encoder_port(intel_encoder); |
963 | int type = intel_encoder->type; | 963 | int type = intel_encoder->type; |
964 | uint32_t temp; | 964 | uint32_t temp; |
@@ -1223,7 +1223,7 @@ void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc) | |||
1223 | struct drm_i915_private *dev_priv = crtc->dev->dev_private; | 1223 | struct drm_i915_private *dev_priv = crtc->dev->dev_private; |
1224 | struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); | 1224 | struct intel_encoder *intel_encoder = intel_ddi_get_crtc_encoder(crtc); |
1225 | enum port port = intel_ddi_get_encoder_port(intel_encoder); | 1225 | enum port port = intel_ddi_get_encoder_port(intel_encoder); |
1226 | enum transcoder cpu_transcoder = intel_crtc->cpu_transcoder; | 1226 | enum transcoder cpu_transcoder = intel_crtc->config.cpu_transcoder; |
1227 | 1227 | ||
1228 | if (cpu_transcoder != TRANSCODER_EDP) | 1228 | if (cpu_transcoder != TRANSCODER_EDP) |
1229 | I915_WRITE(TRANS_CLK_SEL(cpu_transcoder), | 1229 | I915_WRITE(TRANS_CLK_SEL(cpu_transcoder), |
@@ -1233,7 +1233,7 @@ void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc) | |||
1233 | void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc) | 1233 | void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc) |
1234 | { | 1234 | { |
1235 | struct drm_i915_private *dev_priv = intel_crtc->base.dev->dev_private; | 1235 | struct drm_i915_private *dev_priv = intel_crtc->base.dev->dev_private; |
1236 | enum transcoder cpu_transcoder = intel_crtc->cpu_transcoder; | 1236 | enum transcoder cpu_transcoder = intel_crtc->config.cpu_transcoder; |
1237 | 1237 | ||
1238 | if (cpu_transcoder != TRANSCODER_EDP) | 1238 | if (cpu_transcoder != TRANSCODER_EDP) |
1239 | I915_WRITE(TRANS_CLK_SEL(cpu_transcoder), | 1239 | I915_WRITE(TRANS_CLK_SEL(cpu_transcoder), |