Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4691409b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/sor/gm107: training pattern registers are like gm200 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
parent a8953c52

drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ nvkm-y += nvkm/engine/disp/piornv50.o 
nvkm-y += nvkm/engine/disp/sornv50.o

nvkm-y += nvkm/engine/disp/sorg94.o

nvkm-y += nvkm/engine/disp/sorgf119.o

nvkm-y += nvkm/engine/disp/sorgm107.o

nvkm-y += nvkm/engine/disp/sorgm200.o

nvkm-y += nvkm/engine/disp/dport.o

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ gm107_disp = { 
	.outp.internal.crt = nv50_dac_output_new,

	.outp.internal.tmds = nv50_sor_output_new,

	.outp.internal.lvds = nv50_sor_output_new,

	.outp.internal.dp = gf119_sor_dp_new,

	.outp.internal.dp = gm107_sor_dp_new,

	.dac.nr = 3,

	.dac.power = nv50_dac_power,

	.dac.sense = nv50_dac_sense,

drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h

+7 −2
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ int g94_sor_dp_lnk_pwr(struct nvkm_output_dp *, int); 
int gf119_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,

		     struct nvkm_output **);

int gf119_sor_dp_lnk_ctl(struct nvkm_output_dp *, int, int, bool);

int gf119_sor_dp_drv_ctl(struct nvkm_output_dp *, int, int, int, int);



int gm107_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,

		     struct nvkm_output **);

int gm107_sor_dp_pattern(struct nvkm_output_dp *, int);



int gm200_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,

		     struct nvkm_output **);

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ gf119_sor_dp_lnk_ctl(struct nvkm_output_dp *outp, int nr, int bw, bool ef) 
	return 0;

}



static int

int

gf119_sor_dp_drv_ctl(struct nvkm_output_dp *outp,

		     int ln, int vs, int pe, int pc)

{

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

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs <bskeggs@redhat.com>

 */

#include "nv50.h"

#include "outpdp.h"



int

gm107_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)

{

	struct nvkm_device *device = outp->base.disp->engine.subdev.device;

	const u32 soff = outp->base.or * 0x800;

	const u32 data = 0x01010101 * pattern;

	if (outp->base.info.sorconf.link & 1)

		nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, data);

	else

		nvkm_mask(device, 0x61c12c + soff, 0x0f0f0f0f, data);

	return 0;

}



static const struct nvkm_output_dp_func

gm107_sor_dp_func = {

	.pattern = gm107_sor_dp_pattern,

	.lnk_pwr = g94_sor_dp_lnk_pwr,

	.lnk_ctl = gf119_sor_dp_lnk_ctl,

	.drv_ctl = gf119_sor_dp_drv_ctl,

};



int

gm107_sor_dp_new(struct nvkm_disp *disp, int index,

		 struct dcb_output *dcbE, struct nvkm_output **poutp)

{

	return nvkm_output_dp_new_(&gm107_sor_dp_func, disp, index, dcbE, poutp);

}