diff options
| author |  Ville Syrjälä <ville.syrjala@linux.intel.com>
| 2014-04-09 13:28:58 +0300 |
|---|---|---|
| committer |  Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-05-20 15:39:44 +0200 |
| commit | 949c1d43d681a168216afe35071588e8edec354c (patch) | |
| tree | f808e69321bec45746a9dedd638d94781b1ae256 /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915/chv: Fix CHV PLL state tracking (diff) | |
| download | linux-949c1d43d681a168216afe35071588e8edec354c.tar.gz linux-949c1d43d681a168216afe35071588e8edec354c.tar.bz2 linux-949c1d43d681a168216afe35071588e8edec354c.zip | |
drm/i915/chv: Move data lane deassert to encoder pre_enable
We need to pick the correct data lanes based on the port not the
pipe, so move the data lane deassert into the encoder .pre_enable()
hook from the chv_enable_pll().
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 6b635f7a86d8..ca6ca5a17aec 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1257,8 +1257,14 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder) int data, i; u32 val; - /* Program Tx latency optimal setting */ mutex_lock(&dev_priv->dpio_lock); + + /* Deassert soft data lane reset*/ + val = vlv_dpio_read(dev_priv, pipe, VLV_PCS_DW0(ch)); + val |= (DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET); + vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(ch), val); + + /* Program Tx latency optimal setting */ for (i = 0; i < 4; i++) { /* Set the latency optimal bit */ data = (i == 1) ? 0x0 : 0x6; |