1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 8a1b188b4cd1..4562f309ae3d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -317,7 +317,8 @@ train:
                 return false;
 
         config[0] = nv_encoder->dp.link_nr;
-        if (nv_encoder->dp.dpcd_version >= 0x11)
+        if (nv_encoder->dp.dpcd_version >= 0x11 &&
+            nv_encoder->dp.enhanced_frame)
                 config[0] |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
 
         ret = nouveau_dp_lane_count_set(encoder, config[0]);
@@ -468,10 +469,12 @@ nouveau_dp_detect(struct drm_encoder *encoder)
             !nv_encoder->dcb->dpconf.link_bw)
                 nv_encoder->dp.link_bw = DP_LINK_BW_1_62;
 
-        nv_encoder->dp.link_nr = dpcd[2] & 0xf;
+        nv_encoder->dp.link_nr = dpcd[2] & DP_MAX_LANE_COUNT_MASK;
         if (nv_encoder->dp.link_nr > nv_encoder->dcb->dpconf.link_nr)
                 nv_encoder->dp.link_nr = nv_encoder->dcb->dpconf.link_nr;
 
+        nv_encoder->dp.enhanced_frame = (dpcd[2] & DP_ENHANCED_FRAME_CAP);
+
         return true;
 }
 
@@ -524,7 +527,8 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
                 nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x80000000);
                 nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl);
                 nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x00010000);
-                if (!nv_wait(NV50_AUXCH_CTRL(index), 0x00010000, 0x00000000)) {
+                if (!nv_wait(dev, NV50_AUXCH_CTRL(index),
+                             0x00010000, 0x00000000)) {
                         NV_ERROR(dev, "expected bit 16 == 0, got 0x%08x\n",
                                  nv_rd32(dev, NV50_AUXCH_CTRL(index)));
                         ret = -EBUSY;