diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 89122011720b..3e6a3ef10d5c 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -294,8 +294,8 @@ static void hsw_write_infoframe(struct drm_encoder *encoder, | |||
294 | struct drm_device *dev = encoder->dev; | 294 | struct drm_device *dev = encoder->dev; |
295 | struct drm_i915_private *dev_priv = dev->dev_private; | 295 | struct drm_i915_private *dev_priv = dev->dev_private; |
296 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); | 296 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); |
297 | u32 ctl_reg = HSW_TVIDEO_DIP_CTL(intel_crtc->cpu_transcoder); | 297 | u32 ctl_reg = HSW_TVIDEO_DIP_CTL(intel_crtc->config.cpu_transcoder); |
298 | u32 data_reg = hsw_infoframe_data_reg(frame, intel_crtc->cpu_transcoder); | 298 | u32 data_reg = hsw_infoframe_data_reg(frame, intel_crtc->config.cpu_transcoder); |
299 | unsigned int i, len = DIP_HEADER_SIZE + frame->len; | 299 | unsigned int i, len = DIP_HEADER_SIZE + frame->len; |
300 | u32 val = I915_READ(ctl_reg); | 300 | u32 val = I915_READ(ctl_reg); |
301 | 301 | ||
@@ -570,7 +570,7 @@ static void hsw_set_infoframes(struct drm_encoder *encoder, | |||
570 | struct drm_i915_private *dev_priv = encoder->dev->dev_private; | 570 | struct drm_i915_private *dev_priv = encoder->dev->dev_private; |
571 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); | 571 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); |
572 | struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); | 572 | struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); |
573 | u32 reg = HSW_TVIDEO_DIP_CTL(intel_crtc->cpu_transcoder); | 573 | u32 reg = HSW_TVIDEO_DIP_CTL(intel_crtc->config.cpu_transcoder); |
574 | u32 val = I915_READ(reg); | 574 | u32 val = I915_READ(reg); |
575 | 575 | ||
576 | assert_hdmi_port_disabled(intel_hdmi); | 576 | assert_hdmi_port_disabled(intel_hdmi); |