diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-06-03 12:56:18 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-11 16:02:09 +1000 |
| commit | e88146c338c927000db0f115ea3413690cb9f59e (patch) | |
| tree | e1b8fbd0857c1f346ddeea1dcbbeb2bbe02b47a4 | |
| parent | c946b08ba12026cff4932a83c995c975a998e336 (diff) | |
disp/g94-/dp: take max pullup value across all lanes
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | nvkm/engine/disp/sornv94.c | 4 | ||||
| -rw-r--r-- | nvkm/engine/disp/sornvd0.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nvkm/engine/disp/sornv94.c b/nvkm/engine/disp/sornv94.c index d4dfcde0..05487cda 100644 --- a/nvkm/engine/disp/sornv94.c +++ b/nvkm/engine/disp/sornv94.c @@ -127,7 +127,9 @@ nv94_sor_dp_drv_ctl(struct nvkm_output_dp *outp, int ln, int vs, int pe, int pc) 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) & ~(0x0000ff00); + 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); 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)); diff --git a/nvkm/engine/disp/sornvd0.c b/nvkm/engine/disp/sornvd0.c index 0055f869..97f0e9cd 100644 --- a/nvkm/engine/disp/sornvd0.c +++ b/nvkm/engine/disp/sornvd0.c @@ -105,7 +105,9 @@ nvd0_sor_dp_drv_ctl(struct nvkm_output_dp *outp, int ln, int vs, int pe, int pc) 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) & ~(0x0000ff00); + 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); 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)); |