drm/nouveau/disp/dp: fix some tx_pu mishandling

We only need to mask 0x0f on GM2xx, and want to keep the higher bits on
earlier cards.

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
index 8918da7..2982ebf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
@@ -125,7 +125,7 @@ g94_sor_dp_drv_ctl(struct nvkm_output_dp *outp, int ln, int vs, int pe, int pc)
                data[2] = (data[2] & ~0x0000ff00) | (ocfg.tx_pu << 8);
        nv_wr32(priv, 0x61c118 + loff, data[0] | (ocfg.dc << shift));
        nv_wr32(priv, 0x61c120 + loff, data[1] | (ocfg.pe << shift));
-       nv_wr32(priv, 0x61c130 + loff, data[2] | (ocfg.tx_pu << 8));
+       nv_wr32(priv, 0x61c130 + loff, data[2]);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf110.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf110.c
index 52fbe48..2107e31 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf110.c
@@ -102,7 +102,7 @@ gf110_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
                data[2] = (data[2] & ~0x0000ff00) | (ocfg.tx_pu << 8);
        nv_wr32(priv, 0x61c118 + loff, data[0] | (ocfg.dc << shift));
        nv_wr32(priv, 0x61c120 + loff, data[1] | (ocfg.pe << shift));
-       nv_wr32(priv, 0x61c130 + loff, data[2] | (ocfg.tx_pu << 8));
+       nv_wr32(priv, 0x61c130 + loff, data[2]);
        data[3] = nv_rd32(priv, 0x61c13c + loff) & ~(0x000000ff << shift);
        nv_wr32(priv, 0x61c13c + loff, data[3] | (ocfg.pc << shift));
        return 0;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm204.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm204.c
index 1e40dfe..a2706e2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm204.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm204.c
@@ -109,15 +109,16 @@ gm204_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
                                  &ver, &hdr, &cnt, &len, &ocfg);
        if (!addr)
                return -EINVAL;
+       ocfg.tx_pu &= 0x0f;
 
        data[0] = nv_rd32(priv, 0x61c118 + loff) & ~(0x000000ff << shift);
        data[1] = nv_rd32(priv, 0x61c120 + loff) & ~(0x000000ff << shift);
        data[2] = nv_rd32(priv, 0x61c130 + loff);
-       if ((data[2] & 0x0000ff00) < (ocfg.tx_pu << 8) || ln == 0)
-               data[2] = (data[2] & ~0x0000ff00) | (ocfg.tx_pu << 8);
+       if ((data[2] & 0x00000f00) < (ocfg.tx_pu << 8) || ln == 0)
+               data[2] = (data[2] & ~0x00000f00) | (ocfg.tx_pu << 8);
        nv_wr32(priv, 0x61c118 + loff, data[0] | (ocfg.dc << shift));
        nv_wr32(priv, 0x61c120 + loff, data[1] | (ocfg.pe << shift));
-       nv_wr32(priv, 0x61c130 + loff, data[2] | (ocfg.tx_pu << 8));
+       nv_wr32(priv, 0x61c130 + loff, data[2]);
        data[3] = nv_rd32(priv, 0x61c13c + loff) & ~(0x000000ff << shift);
        nv_wr32(priv, 0x61c13c + loff, data[3] | (ocfg.pc << shift));
        return 0;

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c
index 20975d3..dee047b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c
@@ -178,7 +178,7 @@ nvbios_dpcfg_parse(struct nvkm_bios *bios, u16 outp, u8 idx,
                        info->pc    = nv_ro08(bios, data + 0x00);
                        info->dc    = nv_ro08(bios, data + 0x01);
                        info->pe    = nv_ro08(bios, data + 0x02);
-                       info->tx_pu = nv_ro08(bios, data + 0x03) & 0x0f;
+                       info->tx_pu = nv_ro08(bios, data + 0x03);
                        break;
                default:
                        data = 0x0000;