drm/nouveau/disp/sor/gf119: both links use the same training register
authorBen Skeggs <bskeggs@redhat.com>
Fri, 3 Jun 2016 04:37:40 +0000 (14:37 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 6 Jun 2016 22:11:14 +0000 (08:11 +1000)
It appears that, for whatever reason, both link A and B use the same
register to control the training pattern.  It's a little odd, as the
GPUs before this (Tesla/Fermi1) have per-link registers, as do newer
GPUs (Maxwell).

Fixes the third DP output on NVS 510 (GK107).

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c

index b4b41b13564344978517fad5c1a5622430fc1720..5111560b4809afcb645f5a16a5f901db495d553a 100644 (file)
@@ -40,8 +40,7 @@ static int
 gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
 {
        struct nvkm_device *device = outp->base.disp->engine.subdev.device;
-       const u32 loff = gf119_sor_loff(outp);
-       nvkm_mask(device, 0x61c110 + loff, 0x0f0f0f0f, 0x01010101 * pattern);
+       nvkm_mask(device, 0x61c110, 0x0f0f0f0f, 0x01010101 * pattern);
        return 0;
 }