diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-07-06 06:50:36 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 08:42:18 -0700 |
| commit | b3c97aea022236de2ba6bc7f4812f23d088a7df0 (patch) | |
| tree | 6e8e9d393cc64238327dfcc949dd352f7e7b5422 /drivers | |
| parent | 757201791dc53f9fff1e094c6ecc5e37cc45481f (diff) | |
| download | linux-stable-b3c97aea022236de2ba6bc7f4812f23d088a7df0.tar.gz linux-stable-b3c97aea022236de2ba6bc7f4812f23d088a7df0.tar.bz2 linux-stable-b3c97aea022236de2ba6bc7f4812f23d088a7df0.zip | |
drm/nouveau/disp/sor/gf119: select correct sor when poking training pattern
commit 217215041b9285af2193a755b56a8f3ed408bfe2 upstream.
Fixes a regression caused by a stupid thinko from "disp/sor/gf119: both
links use the same training register".
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c index 22706c0a54b5..49bd5da194e1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c @@ -40,7 +40,8 @@ static int gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern) { struct nvkm_device *device = outp->base.disp->engine.subdev.device; - nvkm_mask(device, 0x61c110, 0x0f0f0f0f, 0x01010101 * pattern); + const u32 soff = gf119_sor_soff(outp); + nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, 0x01010101 * pattern); return 0; } |