Merge tag 'drm-for-v4.9' into drm-intel-next-queued

[mirror_ubuntu-bionic-kernel.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 f40a35f2913a8222f2800bfa081b3adb1c636288..8d46f5836746d1eca3459ac6624e4807a7d35efe 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1979,6 +1979,7 @@ void intel_hdmi_init(struct drm_device *dev,
        }
 
        intel_encoder->type = INTEL_OUTPUT_HDMI;
+       intel_encoder->port = port;
        if (IS_CHERRYVIEW(dev)) {
                if (port == PORT_D)
                        intel_encoder->crtc_mask = 1 << 2;