drm/nouveau/i2c: tidy up bit-bang helpers, also fixing nv50 setsda bug

Was using nv_mask, which is bad.  Reading the reg senses the current line
states, which aren't necessarily the states we're trying to drive the
lines to.

Fixed to store SCL driver state just as we already do for SDA.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 5722fd55764b..07bac3602453 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -578,7 +578,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate)
 
         dp.dcb = nv_encoder->dcb;
         dp.crtc = nv_crtc->index;
-        dp.auxch = auxch->rd;
+        dp.auxch = auxch->drive;
         dp.or = nv_encoder->or;
         dp.link = !(nv_encoder->dcb->sorconf.link & 1);
         dp.dpcd = nv_encoder->dp.dpcd;
@@ -653,7 +653,7 @@ nouveau_dp_detect(struct drm_encoder *encoder)
         if (!auxch)
                 return false;
 
-        ret = auxch_tx(dev, auxch->rd, 9, DP_DPCD_REV, dpcd, 8);
+        ret = auxch_tx(dev, auxch->drive, 9, DP_DPCD_REV, dpcd, 8);
         if (ret)
                 return false;
 
@@ -681,7 +681,7 @@ int
 nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
                  uint8_t *data, int data_nr)
 {
-        return auxch_tx(auxch->dev, auxch->rd, cmd, addr, data, data_nr);
+        return auxch_tx(auxch->dev, auxch->drive, cmd, addr, data, data_nr);
 }
 
 static int