diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dpio_phy.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dpio_phy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.c b/drivers/gpu/drm/i915/intel_dpio_phy.c index 288da35572b4..047f48748944 100644 --- a/drivers/gpu/drm/i915/intel_dpio_phy.c +++ b/drivers/gpu/drm/i915/intel_dpio_phy.c | |||
@@ -168,7 +168,7 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder) | |||
168 | { | 168 | { |
169 | struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); | 169 | struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); |
170 | struct drm_device *dev = encoder->base.dev; | 170 | struct drm_device *dev = encoder->base.dev; |
171 | struct drm_i915_private *dev_priv = dev->dev_private; | 171 | struct drm_i915_private *dev_priv = to_i915(dev); |
172 | struct intel_crtc *intel_crtc = | 172 | struct intel_crtc *intel_crtc = |
173 | to_intel_crtc(encoder->base.crtc); | 173 | to_intel_crtc(encoder->base.crtc); |
174 | enum dpio_channel ch = vlv_dport_to_channel(dport); | 174 | enum dpio_channel ch = vlv_dport_to_channel(dport); |
@@ -250,7 +250,7 @@ void chv_phy_pre_encoder_enable(struct intel_encoder *encoder) | |||
250 | struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); | 250 | struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); |
251 | struct intel_digital_port *dport = dp_to_dig_port(intel_dp); | 251 | struct intel_digital_port *dport = dp_to_dig_port(intel_dp); |
252 | struct drm_device *dev = encoder->base.dev; | 252 | struct drm_device *dev = encoder->base.dev; |
253 | struct drm_i915_private *dev_priv = dev->dev_private; | 253 | struct drm_i915_private *dev_priv = to_i915(dev); |
254 | struct intel_crtc *intel_crtc = | 254 | struct intel_crtc *intel_crtc = |
255 | to_intel_crtc(encoder->base.crtc); | 255 | to_intel_crtc(encoder->base.crtc); |
256 | enum dpio_channel ch = vlv_dport_to_channel(dport); | 256 | enum dpio_channel ch = vlv_dport_to_channel(dport); |
@@ -400,7 +400,7 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder) | |||
400 | { | 400 | { |
401 | struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); | 401 | struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); |
402 | struct drm_device *dev = encoder->base.dev; | 402 | struct drm_device *dev = encoder->base.dev; |
403 | struct drm_i915_private *dev_priv = dev->dev_private; | 403 | struct drm_i915_private *dev_priv = to_i915(dev); |
404 | struct intel_crtc *intel_crtc = | 404 | struct intel_crtc *intel_crtc = |
405 | to_intel_crtc(encoder->base.crtc); | 405 | to_intel_crtc(encoder->base.crtc); |
406 | enum dpio_channel port = vlv_dport_to_channel(dport); | 406 | enum dpio_channel port = vlv_dport_to_channel(dport); |
@@ -429,7 +429,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder) | |||
429 | struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); | 429 | struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); |
430 | struct intel_digital_port *dport = dp_to_dig_port(intel_dp); | 430 | struct intel_digital_port *dport = dp_to_dig_port(intel_dp); |
431 | struct drm_device *dev = encoder->base.dev; | 431 | struct drm_device *dev = encoder->base.dev; |
432 | struct drm_i915_private *dev_priv = dev->dev_private; | 432 | struct drm_i915_private *dev_priv = to_i915(dev); |
433 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); | 433 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); |
434 | enum dpio_channel port = vlv_dport_to_channel(dport); | 434 | enum dpio_channel port = vlv_dport_to_channel(dport); |
435 | int pipe = intel_crtc->pipe; | 435 | int pipe = intel_crtc->pipe; |
@@ -457,7 +457,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder) | |||
457 | void vlv_phy_reset_lanes(struct intel_encoder *encoder) | 457 | void vlv_phy_reset_lanes(struct intel_encoder *encoder) |
458 | { | 458 | { |
459 | struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); | 459 | struct intel_digital_port *dport = enc_to_dig_port(&encoder->base); |
460 | struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; | 460 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
461 | struct intel_crtc *intel_crtc = | 461 | struct intel_crtc *intel_crtc = |
462 | to_intel_crtc(encoder->base.crtc); | 462 | to_intel_crtc(encoder->base.crtc); |
463 | enum dpio_channel port = vlv_dport_to_channel(dport); | 463 | enum dpio_channel port = vlv_dport_to_channel(dport); |