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

Dave Airlie committed 10 years ago

Commit 27c0b742 parents fd50870 21721501 file · +2 −1Browse files

Unified · Split

drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c+2−1

@@ -40,7 +40,8 @@ static int · 39 unmodified lines
40	gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)	40	gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
41	{	41	{
42	struct nvkm_device *device = outp->base.disp->engine.subdev.device;	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	return 0;	45	return 0;
45	}	46	}
46		47