aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2010-09-10 14:27:03 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-10 18:13:49 -0400
commitc64e311e650921fb014af2b3c500180fc65802b9 (patch)
treea391720d039bd67420fb7ed4b4569f0f1d4993ab /drivers/gpu/drm/i915/intel_display.c
parentde9c27bf70964a8b257eaeb8f71f1898e9f4ac7d (diff)
drm/i915: set FDI RX TU size to match transmit size
This allows FDI error checking to work. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 358c30127f1a..c31a64daf479 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1857,12 +1857,18 @@ static void ironlake_fdi_enable(struct drm_crtc *crtc)
1857 int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF; 1857 int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
1858 int fdi_tx_reg = (pipe == 0) ? FDI_TXA_CTL : FDI_TXB_CTL; 1858 int fdi_tx_reg = (pipe == 0) ? FDI_TXA_CTL : FDI_TXB_CTL;
1859 int fdi_rx_reg = (pipe == 0) ? FDI_RXA_CTL : FDI_RXB_CTL; 1859 int fdi_rx_reg = (pipe == 0) ? FDI_RXA_CTL : FDI_RXB_CTL;
1860 int data_m1_reg = (pipe == 0) ? PIPEA_DATA_M1 : PIPEB_DATA_M1;
1860 u32 temp; 1861 u32 temp;
1861 u32 pipe_bpc; 1862 u32 pipe_bpc;
1863 u32 tx_size;
1862 1864
1863 temp = I915_READ(pipeconf_reg); 1865 temp = I915_READ(pipeconf_reg);
1864 pipe_bpc = temp & PIPE_BPC_MASK; 1866 pipe_bpc = temp & PIPE_BPC_MASK;
1865 1867
1868 /* Write the TU size bits so error detection works */
1869 tx_size = I915_READ(data_m1_reg) & TU_SIZE_MASK;
1870 I915_WRITE(FDI_RXA_TUSIZE1, tx_size);
1871
1866 /* enable PCH FDI RX PLL, wait warmup plus DMI latency */ 1872 /* enable PCH FDI RX PLL, wait warmup plus DMI latency */
1867 temp = I915_READ(fdi_rx_reg); 1873 temp = I915_READ(fdi_rx_reg);
1868 /* 1874 /*