0903551
From de35f524e89daf8862d49724b9045f9254bfdfea Mon Sep 17 00:00:00 2001
0903551
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
0903551
Date: Mon, 20 Jun 2016 14:52:01 +0200
0903551
Subject: [PATCH 3/6] drm/nouveau/disp/sor/gf119: both links use the same
0903551
 training register
0903551
0903551
Upstream: drm-fixes for 4.7 (and cc'd 4.6-stable)
0903551
commit a8953c52b95167b5d21a66f0859751570271d834
0903551
0903551
Author:     Ben Skeggs <bskeggs@redhat.com>
0903551
AuthorDate: Fri Jun 3 14:37:40 2016 +1000
0903551
Commit:     Ben Skeggs <bskeggs@redhat.com>
0903551
CommitDate: Tue Jun 7 08:11:14 2016 +1000
0903551
0903551
    drm/nouveau/disp/sor/gf119: both links use the same training register
0903551
0903551
    It appears that, for whatever reason, both link A and B use the same
0903551
    register to control the training pattern.  It's a little odd, as the
0903551
    GPUs before this (Tesla/Fermi1) have per-link registers, as do newer
0903551
    GPUs (Maxwell).
0903551
0903551
    Fixes the third DP output on NVS 510 (GK107).
0903551
0903551
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
0903551
    Cc: stable@vger.kernel.org
0903551
---
0903551
 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 3 +--
0903551
 1 file changed, 1 insertion(+), 2 deletions(-)
0903551
0903551
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
0903551
index b4b41b1..5111560 100644
0903551
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
0903551
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
0903551
@@ -40,8 +40,7 @@ static int
0903551
 gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
0903551
 {
0903551
 	struct nvkm_device *device = outp->base.disp->engine.subdev.device;
0903551
-	const u32 loff = gf119_sor_loff(outp);
0903551
-	nvkm_mask(device, 0x61c110 + loff, 0x0f0f0f0f, 0x01010101 * pattern);
0903551
+	nvkm_mask(device, 0x61c110, 0x0f0f0f0f, 0x01010101 * pattern);
0903551
 	return 0;
0903551
 }
0903551
 
0903551
-- 
0903551
2.7.4
0903551