diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-07 12:40:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-07 12:40:12 +1000 |
| commit | 27c0b7419c3a9249b72a67f2c575e22aedd67a67 (patch) | |
| tree | 6a9af660835b62e95683b4f646f807480bd56a20 /drivers | |
| parent | fd50870296d6e73ff277d9f1a518d68c95d17f63 (diff) | |
| parent | 217215041b9285af2193a755b56a8f3ed408bfe2 (diff) | |
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
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
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; } |