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

airlied · airlied · commit 27c0b7419c3a · 2016-07-07T12:40:12.000+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
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ static int`
`40`	`40`	`gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)`
`41`	`41`	`{`
`42`	`42`	`struct nvkm_device *device = outp->base.disp->engine.subdev.device;`
`43`		`- nvkm_mask(device, 0x61c110, 0x0f0f0f0f, 0x01010101 * pattern);`
	`43`	`+ const u32 soff = gf119_sor_soff(outp);`
	`44`	`+ nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, 0x01010101 * pattern);`
`44`	`45`	`return 0;`
`45`	`46`	`}`
`46`	`47`