aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index cacbafdad3ab..bfbe07b6ddce 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1515,11 +1515,6 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
1515 1515
1516 /* Program Tx latency optimal setting */ 1516 /* Program Tx latency optimal setting */
1517 for (i = 0; i < 4; i++) { 1517 for (i = 0; i < 4; i++) {
1518 /* Set the latency optimal bit */
1519 data = (i == 1) ? 0x0 : 0x6;
1520 vlv_dpio_write(dev_priv, pipe, CHV_TX_DW11(ch, i),
1521 data << DPIO_FRC_LATENCY_SHFIT);
1522
1523 /* Set the upar bit */ 1518 /* Set the upar bit */
1524 data = (i == 1) ? 0x0 : 0x1; 1519 data = (i == 1) ? 0x0 : 0x1;
1525 vlv_dpio_write(dev_priv, pipe, CHV_TX_DW14(ch, i), 1520 vlv_dpio_write(dev_priv, pipe, CHV_TX_DW14(ch, i),
@@ -1755,7 +1750,7 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port)
1755 if (!intel_dig_port) 1750 if (!intel_dig_port)
1756 return; 1751 return;
1757 1752
1758 intel_connector = kzalloc(sizeof(*intel_connector), GFP_KERNEL); 1753 intel_connector = intel_connector_alloc();
1759 if (!intel_connector) { 1754 if (!intel_connector) {
1760 kfree(intel_dig_port); 1755 kfree(intel_dig_port);
1761 return; 1756 return;