diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 98f602427eb8..593b8fe2e00a 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -923,42 +923,36 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg) | |||
923 | connector->doublescan_allowed = 0; | 923 | connector->doublescan_allowed = 0; |
924 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2); | 924 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2); |
925 | 925 | ||
926 | intel_encoder->cloneable = false; | ||
927 | |||
926 | /* Set up the DDC bus. */ | 928 | /* Set up the DDC bus. */ |
927 | if (sdvox_reg == SDVOB) { | 929 | if (sdvox_reg == SDVOB) { |
928 | intel_encoder->clone_mask = (1 << INTEL_HDMIB_CLONE_BIT); | ||
929 | intel_hdmi->ddc_bus = GMBUS_PORT_DPB; | 930 | intel_hdmi->ddc_bus = GMBUS_PORT_DPB; |
930 | dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS; | 931 | dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS; |
931 | } else if (sdvox_reg == SDVOC) { | 932 | } else if (sdvox_reg == SDVOC) { |
932 | intel_encoder->clone_mask = (1 << INTEL_HDMIC_CLONE_BIT); | ||
933 | intel_hdmi->ddc_bus = GMBUS_PORT_DPC; | 933 | intel_hdmi->ddc_bus = GMBUS_PORT_DPC; |
934 | dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS; | 934 | dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS; |
935 | } else if (sdvox_reg == HDMIB) { | 935 | } else if (sdvox_reg == HDMIB) { |
936 | intel_encoder->clone_mask = (1 << INTEL_HDMID_CLONE_BIT); | ||
937 | intel_hdmi->ddc_bus = GMBUS_PORT_DPB; | 936 | intel_hdmi->ddc_bus = GMBUS_PORT_DPB; |
938 | dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS; | 937 | dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS; |
939 | } else if (sdvox_reg == HDMIC) { | 938 | } else if (sdvox_reg == HDMIC) { |
940 | intel_encoder->clone_mask = (1 << INTEL_HDMIE_CLONE_BIT); | ||
941 | intel_hdmi->ddc_bus = GMBUS_PORT_DPC; | 939 | intel_hdmi->ddc_bus = GMBUS_PORT_DPC; |
942 | dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS; | 940 | dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS; |
943 | } else if (sdvox_reg == HDMID) { | 941 | } else if (sdvox_reg == HDMID) { |
944 | intel_encoder->clone_mask = (1 << INTEL_HDMIF_CLONE_BIT); | ||
945 | intel_hdmi->ddc_bus = GMBUS_PORT_DPD; | 942 | intel_hdmi->ddc_bus = GMBUS_PORT_DPD; |
946 | dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS; | 943 | dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS; |
947 | } else if (sdvox_reg == DDI_BUF_CTL(PORT_B)) { | 944 | } else if (sdvox_reg == DDI_BUF_CTL(PORT_B)) { |
948 | DRM_DEBUG_DRIVER("LPT: detected output on DDI B\n"); | 945 | DRM_DEBUG_DRIVER("LPT: detected output on DDI B\n"); |
949 | intel_encoder->clone_mask = (1 << INTEL_HDMIB_CLONE_BIT); | ||
950 | intel_hdmi->ddc_bus = GMBUS_PORT_DPB; | 946 | intel_hdmi->ddc_bus = GMBUS_PORT_DPB; |
951 | intel_hdmi->ddi_port = PORT_B; | 947 | intel_hdmi->ddi_port = PORT_B; |
952 | dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS; | 948 | dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS; |
953 | } else if (sdvox_reg == DDI_BUF_CTL(PORT_C)) { | 949 | } else if (sdvox_reg == DDI_BUF_CTL(PORT_C)) { |
954 | DRM_DEBUG_DRIVER("LPT: detected output on DDI C\n"); | 950 | DRM_DEBUG_DRIVER("LPT: detected output on DDI C\n"); |
955 | intel_encoder->clone_mask = (1 << INTEL_HDMIC_CLONE_BIT); | ||
956 | intel_hdmi->ddc_bus = GMBUS_PORT_DPC; | 951 | intel_hdmi->ddc_bus = GMBUS_PORT_DPC; |
957 | intel_hdmi->ddi_port = PORT_C; | 952 | intel_hdmi->ddi_port = PORT_C; |
958 | dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS; | 953 | dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS; |
959 | } else if (sdvox_reg == DDI_BUF_CTL(PORT_D)) { | 954 | } else if (sdvox_reg == DDI_BUF_CTL(PORT_D)) { |
960 | DRM_DEBUG_DRIVER("LPT: detected output on DDI D\n"); | 955 | DRM_DEBUG_DRIVER("LPT: detected output on DDI D\n"); |
961 | intel_encoder->clone_mask = (1 << INTEL_HDMID_CLONE_BIT); | ||
962 | intel_hdmi->ddc_bus = GMBUS_PORT_DPD; | 956 | intel_hdmi->ddc_bus = GMBUS_PORT_DPD; |
963 | intel_hdmi->ddi_port = PORT_D; | 957 | intel_hdmi->ddi_port = PORT_D; |
964 | dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS; | 958 | dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS; |