Merge tag 'v3.7-rc2' into drm-intel-next-queued

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 9ba0aaed7ee851b177b05948f7291c17897df13e..ab1e34b092055e2101548237e8157874b2fa1134 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1027,8 +1027,10 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg, enum port port)
        }
 
        if (IS_HASWELL(dev)) {
+               intel_encoder->pre_enable = intel_ddi_pre_enable;
                intel_encoder->enable = intel_enable_ddi;
                intel_encoder->disable = intel_disable_ddi;
+               intel_encoder->post_disable = intel_ddi_post_disable;
                intel_encoder->get_hw_state = intel_ddi_get_hw_state;
                drm_encoder_helper_add(&intel_encoder->base,
                                       &intel_hdmi_helper_funcs_hsw);