projects/linux·commit 27c0b741

Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes

27c0b741 · Dave Airlie <[email protected]> · 2016-07-07 12:40:12 +10:00

Just one fix for a stupid thinko in a DP training pattern commit.

* 'linux-4.7' of git://github.com/skeggsb/linux:
  drm/nouveau/disp/sor/gf119: select correct sor when poking training pattern
Commit
27c0b7419c3a9249b72a67f2c575e22aedd67a67
Parents
fd508702 · 21721504

Merge commit. Changes below are compared with the first parent: fd508702.

Changes

1 files changed · +2 −1

FileStatusAddDelContent
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.cmodified+2−1View file

drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c

View file
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
index 22706c0..49bd5da 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;
}