drm/nouveau/dp: add support for displayport table 0x30
[cascardo/linux.git] / drivers / gpu / drm / nouveau / nouveau_dp.c
index ae1b6e0..de5efe7 100644 (file)
@@ -28,6 +28,7 @@
 #include "nouveau_i2c.h"
 #include "nouveau_connector.h"
 #include "nouveau_encoder.h"
+#include "nouveau_crtc.h"
 
 /******************************************************************************
  * aux channel util functions
@@ -159,41 +160,6 @@ out:
        return ret;
 }
 
-static int
-auxch_rd(struct drm_encoder *encoder, int address, uint8_t *buf, int size)
-{
-       struct drm_device *dev = encoder->dev;
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       struct nouveau_i2c_chan *auxch;
-       int ret;
-
-       auxch = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
-       if (!auxch)
-               return -ENODEV;
-
-       ret = nouveau_dp_auxch(auxch, 9, address, buf, size);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static int
-auxch_wr(struct drm_encoder *encoder, int address, uint8_t *buf, int size)
-{
-       struct drm_device *dev = encoder->dev;
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       struct nouveau_i2c_chan *auxch;
-       int ret;
-
-       auxch = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
-       if (!auxch)
-               return -ENODEV;
-
-       ret = nouveau_dp_auxch(auxch, 8, address, buf, size);
-       return ret;
-}
-
 static u32
 dp_link_bw_get(struct drm_device *dev, int or, int link)
 {
@@ -304,382 +270,377 @@ nouveau_dp_tu_update(struct drm_device *dev, int or, int link, u32 clk, u32 bpp)
                                                             unk);
 }
 
-static int
-nouveau_dp_lane_count_set(struct drm_encoder *encoder, uint8_t cmd)
-{
-       struct drm_device *dev = encoder->dev;
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       uint32_t tmp;
-       int or = nv_encoder->or, link = !(nv_encoder->dcb->sorconf.link & 1);
-
-       tmp  = nv_rd32(dev, NV50_SOR_DP_CTRL(or, link));
-       tmp &= ~(NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED |
-                NV50_SOR_DP_CTRL_LANE_MASK);
-       tmp |= ((1 << (cmd & DP_LANE_COUNT_MASK)) - 1) << 16;
-       if (cmd & DP_LANE_COUNT_ENHANCED_FRAME_EN)
-               tmp |= NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED;
-       nv_wr32(dev, NV50_SOR_DP_CTRL(or, link), tmp);
-
-       return auxch_wr(encoder, DP_LANE_COUNT_SET, &cmd, 1);
-}
-
-static int
-nouveau_dp_link_bw_set(struct drm_encoder *encoder, uint8_t cmd)
-{
-       struct drm_device *dev = encoder->dev;
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       uint32_t tmp;
-       int reg = 0x614300 + (nv_encoder->or * 0x800);
-
-       tmp  = nv_rd32(dev, reg);
-       tmp &= 0xfff3ffff;
-       if (cmd == DP_LINK_BW_2_7)
-               tmp |= 0x00040000;
-       nv_wr32(dev, reg, tmp);
-
-       return auxch_wr(encoder, DP_LINK_BW_SET, &cmd, 1);
-}
-
-static int
-nouveau_dp_link_train_set(struct drm_encoder *encoder, int pattern)
-{
-       struct drm_device *dev = encoder->dev;
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       uint32_t tmp;
-       uint8_t cmd;
-       int or = nv_encoder->or, link = !(nv_encoder->dcb->sorconf.link & 1);
-       int ret;
-
-       tmp  = nv_rd32(dev, NV50_SOR_DP_CTRL(or, link));
-       tmp &= ~NV50_SOR_DP_CTRL_TRAINING_PATTERN;
-       tmp |= (pattern << 24);
-       nv_wr32(dev, NV50_SOR_DP_CTRL(or, link), tmp);
-
-       ret = auxch_rd(encoder, DP_TRAINING_PATTERN_SET, &cmd, 1);
-       if (ret)
-               return ret;
-       cmd &= ~DP_TRAINING_PATTERN_MASK;
-       cmd |= (pattern & DP_TRAINING_PATTERN_MASK);
-       return auxch_wr(encoder, DP_TRAINING_PATTERN_SET, &cmd, 1);
-}
-
-static int
-nouveau_dp_max_voltage_swing(struct drm_encoder *encoder)
+u8 *
+nouveau_dp_bios_data(struct drm_device *dev, struct dcb_entry *dcb, u8 **entry)
 {
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       struct drm_device *dev = encoder->dev;
-       struct bit_displayport_encoder_table_entry *dpse;
-       struct bit_displayport_encoder_table *dpe;
-       int i, dpe_headerlen, max_vs = 0;
-
-       dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
-       if (!dpe)
-               return false;
-       dpse = (void *)((char *)dpe + dpe_headerlen);
-
-       for (i = 0; i < dpe_headerlen; i++, dpse++) {
-               if (dpse->vs_level > max_vs)
-                       max_vs = dpse->vs_level;
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
+       struct nvbios *bios = &dev_priv->vbios;
+       struct bit_entry d;
+       u8 *table;
+       int i;
+
+       if (bit_table(dev, 'd', &d)) {
+               NV_ERROR(dev, "BIT 'd' table not found\n");
+               return NULL;
        }
 
-       return max_vs;
-}
-
-static int
-nouveau_dp_max_pre_emphasis(struct drm_encoder *encoder, int vs)
-{
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       struct drm_device *dev = encoder->dev;
-       struct bit_displayport_encoder_table_entry *dpse;
-       struct bit_displayport_encoder_table *dpe;
-       int i, dpe_headerlen, max_pre = 0;
+       if (d.version != 1) {
+               NV_ERROR(dev, "BIT 'd' table version %d unknown\n", d.version);
+               return NULL;
+       }
 
-       dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
-       if (!dpe)
-               return false;
-       dpse = (void *)((char *)dpe + dpe_headerlen);
+       table = ROMPTR(bios, d.data[0]);
+       if (!table) {
+               NV_ERROR(dev, "displayport table pointer invalid\n");
+               return NULL;
+       }
 
-       for (i = 0; i < dpe_headerlen; i++, dpse++) {
-               if (dpse->vs_level != vs)
-                       continue;
+       switch (table[0]) {
+       case 0x20:
+       case 0x21:
+       case 0x30:
+               break;
+       default:
+               NV_ERROR(dev, "displayport table 0x%02x unknown\n", table[0]);
+               return NULL;
+       }
 
-               if (dpse->pre_level > max_pre)
-                       max_pre = dpse->pre_level;
+       for (i = 0; i < table[3]; i++) {
+               *entry = ROMPTR(bios, table[table[1] + (i * table[2])]);
+               if (*entry && bios_encoder_match(dcb, ROM32((*entry)[0])))
+                       return table;
        }
 
-       return max_pre;
+       NV_ERROR(dev, "displayport encoder table not found\n");
+       return NULL;
 }
 
-static bool
-nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config)
-{
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       struct drm_device *dev = encoder->dev;
-       struct bit_displayport_encoder_table *dpe;
-       int ret, i, dpe_headerlen, vs = 0, pre = 0;
-       uint8_t request[2];
-
-       dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
-       if (!dpe)
-               return false;
-
-       ret = auxch_rd(encoder, DP_ADJUST_REQUEST_LANE0_1, request, 2);
-       if (ret)
-               return false;
-
-       NV_DEBUG_KMS(dev, "\t\tadjust 0x%02x 0x%02x\n", request[0], request[1]);
-
-       /* Keep all lanes at the same level.. */
-       for (i = 0; i < nv_encoder->dp.link_nr; i++) {
-               int lane_req = (request[i >> 1] >> ((i & 1) << 2)) & 0xf;
-               int lane_vs = lane_req & 3;
-               int lane_pre = (lane_req >> 2) & 3;
+/******************************************************************************
+ * link training
+ *****************************************************************************/
+struct dp_state {
+       struct dcb_entry *dcb;
+       u8 *table;
+       u8 *entry;
+       int auxch;
+       int crtc;
+       int or;
+       int link;
+       u8 *dpcd;
+       int link_nr;
+       u32 link_bw;
+       u8  stat[6];
+       u8  conf[4];
+};
 
-               if (lane_vs > vs)
-                       vs = lane_vs;
-               if (lane_pre > pre)
-                       pre = lane_pre;
+static void
+dp_set_link_config(struct drm_device *dev, struct dp_state *dp)
+{
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
+       int or = dp->or, link = dp->link;
+       u8 *entry, sink[2];
+       u32 dp_ctrl;
+       u16 script;
+
+       NV_DEBUG_KMS(dev, "%d lanes at %d KB/s\n", dp->link_nr, dp->link_bw);
+
+       /* set selected link rate on source */
+       switch (dp->link_bw) {
+       case 270000:
+               nv_mask(dev, 0x614300 + (or * 0x800), 0x000c0000, 0x00040000);
+               sink[0] = DP_LINK_BW_2_7;
+               break;
+       default:
+               nv_mask(dev, 0x614300 + (or * 0x800), 0x000c0000, 0x00000000);
+               sink[0] = DP_LINK_BW_1_62;
+               break;
        }
 
-       if (vs >= nouveau_dp_max_voltage_swing(encoder)) {
-               vs  = nouveau_dp_max_voltage_swing(encoder);
-               vs |= 4;
+       /* offset +0x0a of each dp encoder table entry is a pointer to another
+        * table, that has (among other things) pointers to more scripts that
+        * need to be executed, this time depending on link speed.
+        */
+       entry = ROMPTR(&dev_priv->vbios, dp->entry[10]);
+       if (entry) {
+               if (dp->table[0] < 0x30) {
+                       while (dp->link_bw < (ROM16(entry[0]) * 10))
+                               entry += 4;
+                       script = ROM16(entry[2]);
+               } else {
+                       while (dp->link_bw < (entry[0] * 27000))
+                               entry += 3;
+                       script = ROM16(entry[1]);
+               }
+
+               nouveau_bios_run_init_table(dev, script, dp->dcb, dp->crtc);
        }
 
-       if (pre >= nouveau_dp_max_pre_emphasis(encoder, vs & 3)) {
-               pre  = nouveau_dp_max_pre_emphasis(encoder, vs & 3);
-               pre |= 4;
+       /* configure lane count on the source */
+       dp_ctrl = ((1 << dp->link_nr) - 1) << 16;
+       sink[1] = dp->link_nr;
+       if (dp->dpcd[2] & DP_ENHANCED_FRAME_CAP) {
+               dp_ctrl |= 0x00004000;
+               sink[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
        }
 
-       /* Update the configuration for all lanes.. */
-       for (i = 0; i < nv_encoder->dp.link_nr; i++)
-               config[i] = (pre << 3) | vs;
+       nv_mask(dev, NV50_SOR_DP_CTRL(or, link), 0x001f4000, dp_ctrl);
 
-       return true;
+       /* inform the sink of the new configuration */
+       auxch_tx(dev, dp->auxch, 8, DP_LINK_BW_SET, sink, 2);
 }
 
-static bool
-nouveau_dp_link_train_commit(struct drm_encoder *encoder, uint8_t *config)
+static void
+dp_set_training_pattern(struct drm_device *dev, struct dp_state *dp, u8 tp)
 {
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       struct drm_device *dev = encoder->dev;
-       struct bit_displayport_encoder_table_entry *dpse;
-       struct bit_displayport_encoder_table *dpe;
-       int or = nv_encoder->or, link = !(nv_encoder->dcb->sorconf.link & 1);
-       int dpe_headerlen, ret, i;
+       u8 sink_tp;
 
-       NV_DEBUG_KMS(dev, "\t\tconfig 0x%02x 0x%02x 0x%02x 0x%02x\n",
-                config[0], config[1], config[2], config[3]);
+       NV_DEBUG_KMS(dev, "training pattern %d\n", tp);
 
-       dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
-       if (!dpe)
-               return false;
-       dpse = (void *)((char *)dpe + dpe_headerlen);
+       nv_mask(dev, NV50_SOR_DP_CTRL(dp->or, dp->link), 0x0f000000, tp << 24);
 
-       for (i = 0; i < dpe->record_nr; i++, dpse++) {
-               if (dpse->vs_level == (config[0] & 3) &&
-                   dpse->pre_level == ((config[0] >> 3) & 3))
-                       break;
-       }
-       BUG_ON(i == dpe->record_nr);
-
-       for (i = 0; i < nv_encoder->dp.link_nr; i++) {
-               const int shift[4] = { 16, 8, 0, 24 };
-               uint32_t mask = 0xff << shift[i];
-               uint32_t reg0, reg1, reg2;
-
-               reg0  = nv_rd32(dev, NV50_SOR_DP_UNK118(or, link)) & ~mask;
-               reg0 |= (dpse->reg0 << shift[i]);
-               reg1  = nv_rd32(dev, NV50_SOR_DP_UNK120(or, link)) & ~mask;
-               reg1 |= (dpse->reg1 << shift[i]);
-               reg2  = nv_rd32(dev, NV50_SOR_DP_UNK130(or, link)) & 0xffff00ff;
-               reg2 |= (dpse->reg2 << 8);
-               nv_wr32(dev, NV50_SOR_DP_UNK118(or, link), reg0);
-               nv_wr32(dev, NV50_SOR_DP_UNK120(or, link), reg1);
-               nv_wr32(dev, NV50_SOR_DP_UNK130(or, link), reg2);
-       }
-
-       ret = auxch_wr(encoder, DP_TRAINING_LANE0_SET, config, 4);
-       if (ret)
-               return false;
-
-       return true;
+       auxch_tx(dev, dp->auxch, 9, DP_TRAINING_PATTERN_SET, &sink_tp, 1);
+       sink_tp &= ~DP_TRAINING_PATTERN_MASK;
+       sink_tp |= tp;
+       auxch_tx(dev, dp->auxch, 8, DP_TRAINING_PATTERN_SET, &sink_tp, 1);
 }
 
-bool
-nouveau_dp_link_train(struct drm_encoder *encoder)
+static const u8 nv50_lane_map[] = { 16, 8, 0, 24 };
+static const u8 nvaf_lane_map[] = { 24, 16, 8, 0 };
+
+static int
+dp_link_train_commit(struct drm_device *dev, struct dp_state *dp)
 {
-       struct drm_device *dev = encoder->dev;
        struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
-       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-       struct nouveau_connector *nv_connector;
-       struct bit_displayport_encoder_table *dpe;
-       int dpe_headerlen;
-       uint8_t config[4], status[3];
-       bool cr_done, cr_max_vs, eq_done, hpd_state;
-       int ret = 0, i, tries, voltage;
-
-       NV_DEBUG_KMS(dev, "link training!!\n");
-
-       nv_connector = nouveau_encoder_connector_get(nv_encoder);
-       if (!nv_connector)
-               return false;
+       u32 mask = 0, drv = 0, pre = 0, unk = 0;
+       const u8 *shifts;
+       int link = dp->link;
+       int or = dp->or;
+       int i;
+
+       if (dev_priv->chipset != 0xaf)
+               shifts = nv50_lane_map;
+       else
+               shifts = nvaf_lane_map;
+
+       for (i = 0; i < dp->link_nr; i++) {
+               u8 *conf = dp->entry + dp->table[4];
+               u8 lane = (dp->stat[4 + (i >> 1)] >> ((i & 1) * 4)) & 0xf;
+               u8 lpre = (lane & 0x0c) >> 2;
+               u8 lvsw = (lane & 0x03) >> 0;
+
+               mask |= 0xff << shifts[i];
+               unk |= 1 << (shifts[i] >> 3);
+
+               dp->conf[i] = (lpre << 3) | lvsw;
+               if (lvsw == DP_TRAIN_VOLTAGE_SWING_1200)
+                       dp->conf[i] |= DP_TRAIN_MAX_SWING_REACHED;
+               if (lpre == DP_TRAIN_PRE_EMPHASIS_9_5)
+                       dp->conf[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
+
+               NV_DEBUG_KMS(dev, "config lane %d %02x\n", i, dp->conf[i]);
+
+               if (dp->table[0] < 0x30) {
+                       u8 *last = conf + (dp->entry[4] * dp->table[5]);
+                       while (lvsw != conf[0] || lpre != conf[1]) {
+                               conf += dp->table[5];
+                               if (conf >= last)
+                                       return -EINVAL;
+                       }
 
-       dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
-       if (!dpe) {
-               NV_ERROR(dev, "SOR-%d: no DP encoder table!\n", nv_encoder->or);
-               return false;
-       }
+                       conf += 2;
+               } else {
+                       /* no lookup table anymore, set entries for each
+                        * combination of voltage swing and pre-emphasis
+                        * level allowed by the DP spec.
+                        */
+                       switch (lvsw) {
+                       case 0: lpre += 0; break;
+                       case 1: lpre += 4; break;
+                       case 2: lpre += 7; break;
+                       case 3: lpre += 9; break;
+                       }
 
-       /* disable hotplug detect, this flips around on some panels during
-        * link training.
-        */
-       hpd_state = pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, false);
+                       conf = conf + (lpre * dp->table[5]);
+                       conf++;
+               }
 
-       if (dpe->script0) {
-               NV_DEBUG_KMS(dev, "SOR-%d: running DP script 0\n", nv_encoder->or);
-               nouveau_bios_run_init_table(dev, le16_to_cpu(dpe->script0),
-                                           nv_encoder->dcb, -1);
+               drv |= conf[0] << shifts[i];
+               pre |= conf[1] << shifts[i];
+               unk  = (unk & ~0x0000ff00) | (conf[2] << 8);
        }
 
-train:
-       cr_done = eq_done = false;
+       nv_mask(dev, NV50_SOR_DP_UNK118(or, link), mask, drv);
+       nv_mask(dev, NV50_SOR_DP_UNK120(or, link), mask, pre);
+       nv_mask(dev, NV50_SOR_DP_UNK130(or, link), 0x0000ff0f, unk);
 
-       /* set link configuration */
-       NV_DEBUG_KMS(dev, "\tbegin train: bw %d, lanes %d\n",
-                nv_encoder->dp.link_bw, nv_encoder->dp.link_nr);
+       return auxch_tx(dev, dp->auxch, 8, DP_TRAINING_LANE0_SET, dp->conf, 4);
+}
 
-       ret = nouveau_dp_link_bw_set(encoder, nv_encoder->dp.link_bw);
-       if (ret)
-               return false;
+static int
+dp_link_train_update(struct drm_device *dev, struct dp_state *dp, u32 delay)
+{
+       int ret;
 
-       config[0] = nv_encoder->dp.link_nr;
-       if (nv_encoder->dp.dpcd_version >= 0x11 &&
-           nv_encoder->dp.enhanced_frame)
-               config[0] |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
+       udelay(delay);
 
-       ret = nouveau_dp_lane_count_set(encoder, config[0]);
+       ret = auxch_tx(dev, dp->auxch, 9, DP_LANE0_1_STATUS, dp->stat, 6);
        if (ret)
-               return false;
+               return ret;
 
-       /* clock recovery */
-       NV_DEBUG_KMS(dev, "\tbegin cr\n");
-       ret = nouveau_dp_link_train_set(encoder, DP_TRAINING_PATTERN_1);
-       if (ret)
-               goto stop;
+       NV_DEBUG_KMS(dev, "status %02x %02x %02x %02x %02x %02x\n",
+                    dp->stat[0], dp->stat[1], dp->stat[2], dp->stat[3],
+                    dp->stat[4], dp->stat[5]);
+       return 0;
+}
 
-       tries = 0;
-       voltage = -1;
-       memset(config, 0x00, sizeof(config));
-       for (;;) {
-               if (!nouveau_dp_link_train_commit(encoder, config))
-                       break;
+static int
+dp_link_train_cr(struct drm_device *dev, struct dp_state *dp)
+{
+       bool cr_done = false, abort = false;
+       int voltage = dp->conf[0] & DP_TRAIN_VOLTAGE_SWING_MASK;
+       int tries = 0, i;
 
-               udelay(100);
+       dp_set_training_pattern(dev, dp, DP_TRAINING_PATTERN_1);
 
-               ret = auxch_rd(encoder, DP_LANE0_1_STATUS, status, 2);
-               if (ret)
+       do {
+               if (dp_link_train_commit(dev, dp) ||
+                   dp_link_train_update(dev, dp, 100))
                        break;
-               NV_DEBUG_KMS(dev, "\t\tstatus: 0x%02x 0x%02x\n",
-                        status[0], status[1]);
 
                cr_done = true;
-               cr_max_vs = false;
-               for (i = 0; i < nv_encoder->dp.link_nr; i++) {
-                       int lane = (status[i >> 1] >> ((i & 1) * 4)) & 0xf;
-
+               for (i = 0; i < dp->link_nr; i++) {
+                       u8 lane = (dp->stat[i >> 1] >> ((i & 1) * 4)) & 0xf;
                        if (!(lane & DP_LANE_CR_DONE)) {
                                cr_done = false;
-                               if (config[i] & DP_TRAIN_MAX_PRE_EMPHASIS_REACHED)
-                                       cr_max_vs = true;
+                               if (dp->conf[i] & DP_TRAIN_MAX_SWING_REACHED)
+                                       abort = true;
                                break;
                        }
                }
 
-               if ((config[0] & DP_TRAIN_VOLTAGE_SWING_MASK) != voltage) {
-                       voltage = config[0] & DP_TRAIN_VOLTAGE_SWING_MASK;
+               if ((dp->conf[0] & DP_TRAIN_VOLTAGE_SWING_MASK) != voltage) {
+                       voltage = dp->conf[0] & DP_TRAIN_VOLTAGE_SWING_MASK;
                        tries = 0;
                }
+       } while (!cr_done && !abort && ++tries < 5);
 
-               if (cr_done || cr_max_vs || (++tries == 5))
-                       break;
-
-               if (!nouveau_dp_link_train_adjust(encoder, config))
-                       break;
-       }
-
-       if (!cr_done)
-               goto stop;
+       return cr_done ? 0 : -1;
+}
 
-       /* channel equalisation */
-       NV_DEBUG_KMS(dev, "\tbegin eq\n");
-       ret = nouveau_dp_link_train_set(encoder, DP_TRAINING_PATTERN_2);
-       if (ret)
-               goto stop;
+static int
+dp_link_train_eq(struct drm_device *dev, struct dp_state *dp)
+{
+       bool eq_done, cr_done = true;
+       int tries = 0, i;
 
-       for (tries = 0; tries <= 5; tries++) {
-               udelay(400);
+       dp_set_training_pattern(dev, dp, DP_TRAINING_PATTERN_2);
 
-               ret = auxch_rd(encoder, DP_LANE0_1_STATUS, status, 3);
-               if (ret)
+       do {
+               if (dp_link_train_update(dev, dp, 400))
                        break;
-               NV_DEBUG_KMS(dev, "\t\tstatus: 0x%02x 0x%02x\n",
-                        status[0], status[1]);
-
-               eq_done = true;
-               if (!(status[2] & DP_INTERLANE_ALIGN_DONE))
-                       eq_done = false;
 
-               for (i = 0; eq_done && i < nv_encoder->dp.link_nr; i++) {
-                       int lane = (status[i >> 1] >> ((i & 1) * 4)) & 0xf;
-
-                       if (!(lane & DP_LANE_CR_DONE)) {
+               eq_done = !!(dp->stat[2] & DP_INTERLANE_ALIGN_DONE);
+               for (i = 0; i < dp->link_nr && eq_done; i++) {
+                       u8 lane = (dp->stat[i >> 1] >> ((i & 1) * 4)) & 0xf;
+                       if (!(lane & DP_LANE_CR_DONE))
                                cr_done = false;
-                               break;
-                       }
-
                        if (!(lane & DP_LANE_CHANNEL_EQ_DONE) ||
-                           !(lane & DP_LANE_SYMBOL_LOCKED)) {
+                           !(lane & DP_LANE_SYMBOL_LOCKED))
                                eq_done = false;
-                               break;
-                       }
                }
 
-               if (eq_done || !cr_done)
+               if (dp_link_train_commit(dev, dp))
                        break;
+       } while (!eq_done && cr_done && ++tries <= 5);
 
-               if (!nouveau_dp_link_train_adjust(encoder, config) ||
-                   !nouveau_dp_link_train_commit(encoder, config))
-                       break;
-       }
+       return eq_done ? 0 : -1;
+}
 
-stop:
-       /* end link training */
-       ret = nouveau_dp_link_train_set(encoder, DP_TRAINING_PATTERN_DISABLE);
-       if (ret)
+bool
+nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate)
+{
+       struct drm_nouveau_private *dev_priv = encoder->dev->dev_private;
+       struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
+       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+       struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
+       struct nouveau_connector *nv_connector =
+               nouveau_encoder_connector_get(nv_encoder);
+       struct drm_device *dev = encoder->dev;
+       struct nouveau_i2c_chan *auxch;
+       const u32 bw_list[] = { 270000, 162000, 0 };
+       const u32 *link_bw = bw_list;
+       struct dp_state dp;
+
+       auxch = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
+       if (!auxch)
                return false;
 
-       /* retry at a lower setting, if possible */
-       if (!ret && !(eq_done && cr_done)) {
-               NV_DEBUG_KMS(dev, "\twe failed\n");
-               if (nv_encoder->dp.link_bw != DP_LINK_BW_1_62) {
-                       NV_DEBUG_KMS(dev, "retry link training at low rate\n");
-                       nv_encoder->dp.link_bw = DP_LINK_BW_1_62;
-                       goto train;
-               }
+       dp.table = nouveau_dp_bios_data(dev, nv_encoder->dcb, &dp.entry);
+       if (!dp.table)
+               return -EINVAL;
+
+       dp.dcb = nv_encoder->dcb;
+       dp.crtc = nv_crtc->index;
+       dp.auxch = auxch->rd;
+       dp.or = nv_encoder->or;
+       dp.link = !(nv_encoder->dcb->sorconf.link & 1);
+       dp.dpcd = nv_encoder->dp.dpcd;
+
+       /* some sinks toggle hotplug in response to some of the actions
+        * we take during link training (DP_SET_POWER is one), we need
+        * to ignore them for the moment to avoid races.
+        */
+       pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, false);
+
+       /* enable down-spreading, if possible */
+       if (dp.table[1] >= 16) {
+               u16 script = ROM16(dp.entry[14]);
+               if (nv_encoder->dp.dpcd[3] & 1)
+                       script = ROM16(dp.entry[12]);
+
+               nouveau_bios_run_init_table(dev, script, dp.dcb, dp.crtc);
        }
 
-       if (dpe->script1) {
-               NV_DEBUG_KMS(dev, "SOR-%d: running DP script 1\n", nv_encoder->or);
-               nouveau_bios_run_init_table(dev, le16_to_cpu(dpe->script1),
-                                           nv_encoder->dcb, -1);
+       /* execute pre-train script from vbios */
+       nouveau_bios_run_init_table(dev, ROM16(dp.entry[6]), dp.dcb, dp.crtc);
+
+       /* start off at highest link rate supported by encoder and display */
+       while (*link_bw > nv_encoder->dp.link_bw)
+               link_bw++;
+
+       while (link_bw[0]) {
+               /* find minimum required lane count at this link rate */
+               dp.link_nr = nv_encoder->dp.link_nr;
+               while ((dp.link_nr >> 1) * link_bw[0] > datarate)
+                       dp.link_nr >>= 1;
+
+               /* drop link rate to minimum with this lane count */
+               while ((link_bw[1] * dp.link_nr) > datarate)
+                       link_bw++;
+               dp.link_bw = link_bw[0];
+
+               /* program selected link configuration */
+               dp_set_link_config(dev, &dp);
+
+               /* attempt to train the link at this configuration */
+               memset(dp.stat, 0x00, sizeof(dp.stat));
+               if (!dp_link_train_cr(dev, &dp) &&
+                   !dp_link_train_eq(dev, &dp))
+                       break;
+
+               /* retry at lower rate */
+               link_bw++;
        }
 
-       /* re-enable hotplug detect */
-       pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, hpd_state);
+       /* finish link training */
+       dp_set_training_pattern(dev, &dp, DP_TRAINING_PATTERN_DISABLE);
+
+       /* execute post-train script from vbios */
+       nouveau_bios_run_init_table(dev, ROM16(dp.entry[8]), dp.dcb, dp.crtc);
 
-       return eq_done;
+       /* re-enable hotplug detect */
+       pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, true);
+       return true;
 }
 
 bool
@@ -687,31 +648,34 @@ nouveau_dp_detect(struct drm_encoder *encoder)
 {
        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
        struct drm_device *dev = encoder->dev;
-       uint8_t dpcd[4];
+       struct nouveau_i2c_chan *auxch;
+       u8 *dpcd = nv_encoder->dp.dpcd;
        int ret;
 
-       ret = auxch_rd(encoder, 0x0000, dpcd, 4);
-       if (ret)
+       auxch = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index);
+       if (!auxch)
                return false;
 
-       NV_DEBUG_KMS(dev, "encoder: link_bw %d, link_nr %d\n"
-                     "display: link_bw %d, link_nr %d version 0x%02x\n",
-                nv_encoder->dcb->dpconf.link_bw,
-                nv_encoder->dcb->dpconf.link_nr,
-                dpcd[1], dpcd[2] & 0x0f, dpcd[0]);
+       ret = auxch_tx(dev, auxch->rd, 9, DP_DPCD_REV, dpcd, 8);
+       if (ret)
+               return false;
 
-       nv_encoder->dp.dpcd_version = dpcd[0];
+       nv_encoder->dp.link_bw = 27000 * dpcd[1];
+       nv_encoder->dp.link_nr = dpcd[2] & DP_MAX_LANE_COUNT_MASK;
 
-       nv_encoder->dp.link_bw = dpcd[1];
-       if (nv_encoder->dp.link_bw != DP_LINK_BW_1_62 &&
-           !nv_encoder->dcb->dpconf.link_bw)
-               nv_encoder->dp.link_bw = DP_LINK_BW_1_62;
+       NV_DEBUG_KMS(dev, "display: %dx%d dpcd 0x%02x\n",
+                    nv_encoder->dp.link_nr, nv_encoder->dp.link_bw, dpcd[0]);
+       NV_DEBUG_KMS(dev, "encoder: %dx%d\n",
+                    nv_encoder->dcb->dpconf.link_nr,
+                    nv_encoder->dcb->dpconf.link_bw);
 
-       nv_encoder->dp.link_nr = dpcd[2] & DP_MAX_LANE_COUNT_MASK;
-       if (nv_encoder->dp.link_nr > nv_encoder->dcb->dpconf.link_nr)
+       if (nv_encoder->dcb->dpconf.link_nr < nv_encoder->dp.link_nr)
                nv_encoder->dp.link_nr = nv_encoder->dcb->dpconf.link_nr;
+       if (nv_encoder->dcb->dpconf.link_bw < nv_encoder->dp.link_bw)
+               nv_encoder->dp.link_bw = nv_encoder->dcb->dpconf.link_bw;
 
-       nv_encoder->dp.enhanced_frame = (dpcd[2] & DP_ENHANCED_FRAME_CAP);
+       NV_DEBUG_KMS(dev, "maximum: %dx%d\n",
+                    nv_encoder->dp.link_nr, nv_encoder->dp.link_bw);
 
        return true;
 }