| From 217215041b9285af2193a755b56a8f3ed408bfe2 Mon Sep 17 00:00:00 2001 |
| From: Ben Skeggs <bskeggs@redhat.com> |
| Date: Wed, 6 Jul 2016 06:50:36 +1000 |
| Subject: drm/nouveau/disp/sor/gf119: select correct sor when poking training pattern |
| |
| From: Ben Skeggs <bskeggs@redhat.com> |
| |
| 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> |
| |
| --- |
| drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- 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; |
| } |
| |
