| From a8953c52b95167b5d21a66f0859751570271d834 Mon Sep 17 00:00:00 2001 |
| From: Ben Skeggs <bskeggs@redhat.com> |
| Date: Fri, 3 Jun 2016 14:37:40 +1000 |
| Subject: drm/nouveau/disp/sor/gf119: both links use the same training register |
| |
| From: Ben Skeggs <bskeggs@redhat.com> |
| |
| commit a8953c52b95167b5d21a66f0859751570271d834 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c |
| +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c |
| @@ -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; |
| } |
| |