drm/nouveau/disp/g94-: port OR DP drive setting control to nvkm_ior (7d1fede0) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+22 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,9 +73,15 @@ static int
	nvkm_dp_train_drive(struct lt_state *lt, bool pc)		nvkm_dp_train_drive(struct lt_state *lt, bool pc)
	{		{
	struct nvkm_dp *dp = lt->dp;		struct nvkm_dp *dp = lt->dp;
			struct nvkm_ior *ior = dp->outp.ior;
			struct nvkm_bios *bios = ior->disp->engine.subdev.device->bios;
			struct nvbios_dpout info;
			struct nvbios_dpcfg ocfg;
			u8 ver, hdr, cnt, len;
			u32 data;
	int ret, i;		int ret, i;

	for (i = 0; i < dp->outp.ior->dp.nr; i++) {		for (i = 0; i < ior->dp.nr; i++) {
	u8 lane = (lt->stat[4 + (i >> 1)] >> ((i & 1) * 4)) & 0xf;		u8 lane = (lt->stat[4 + (i >> 1)] >> ((i & 1) * 4)) & 0xf;
	u8 lpc2 = (lt->pc2stat >> (i * 2)) & 0x3;		u8 lpc2 = (lt->pc2stat >> (i * 2)) & 0x3;
	u8 lpre = (lane & 0x0c) >> 2;		u8 lpre = (lane & 0x0c) >> 2;
	@@ -99,7 +105,21 @@ nvkm_dp_train_drive(struct lt_state *lt, bool pc)

	OUTP_TRACE(&dp->outp, "config lane %d %02x %02x",		OUTP_TRACE(&dp->outp, "config lane %d %02x %02x",
	i, lt->conf[i], lpc2);		i, lt->conf[i], lpc2);
	dp->func->drv_ctl(dp, i, lvsw & 3, lpre & 3, lpc2 & 3);
			data = nvbios_dpout_match(bios, dp->outp.info.hasht,
			dp->outp.info.hashm,
			&ver, &hdr, &cnt, &len, &info);
			if (!data)
			continue;

			data = nvbios_dpcfg_match(bios, data, lpc2 & 3, lvsw & 3,
			lpre & 3, &ver, &hdr, &cnt, &len,
			&ocfg);
			if (!data)
			continue;

			ior->func->dp.drive(ior, i, ocfg.pc, ocfg.dc,
			ocfg.pe, ocfg.tx_pu);
	}		}

	ret = nvkm_wraux(dp->aux, DPCD_LC03(0), lt->conf, 4);		ret = nvkm_wraux(dp->aux, DPCD_LC03(0), lt->conf, 4);

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,6 @@ struct nvkm_dp {
	#define nvkm_output_dp nvkm_dp		#define nvkm_output_dp nvkm_dp

	struct nvkm_output_dp_func {		struct nvkm_output_dp_func {
	int (drv_ctl)(struct nvkm_output_dp , int ln, int vs, int pe, int pc);
	void (vcpi)(struct nvkm_output_dp , int head, u8 start_slot,		void (vcpi)(struct nvkm_output_dp , int head, u8 start_slot,
	u8 num_slots, u16 pbn, u16 aligned_pbn);		u8 num_slots, u16 pbn, u16 aligned_pbn);
	};		};
	@@ -51,7 +50,6 @@ int g94_sor_dp_new(struct nvkm_disp , int, struct dcb_output ,

	int gf119_sor_dp_new(struct nvkm_disp , int, struct dcb_output ,		int gf119_sor_dp_new(struct nvkm_disp , int, struct dcb_output ,
	struct nvkm_output **);		struct nvkm_output **);
	int gf119_sor_dp_drv_ctl(struct nvkm_dp *, int, int, int, int);
	void gf119_sor_dp_vcpi(struct nvkm_dp *, int, u8, u8, u16, u16);		void gf119_sor_dp_vcpi(struct nvkm_dp *, int, u8, u8, u16, u16);

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

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,8 @@ struct nvkm_ior_func {
	int (links)(struct nvkm_ior , struct nvkm_i2c_aux *);		int (links)(struct nvkm_ior , struct nvkm_i2c_aux *);
	void (power)(struct nvkm_ior , int nr);		void (power)(struct nvkm_ior , int nr);
	void (pattern)(struct nvkm_ior , int pattern);		void (pattern)(struct nvkm_ior , int pattern);
			void (drive)(struct nvkm_ior , int ln, int pc,
			int dc, int pe, int tx_pu);
	} dp;		} dp;
	};		};

	@@ -86,10 +88,12 @@ void g94_sor_state(struct nvkm_ior , struct nvkm_ior_state );
	int g94_sor_dp_links(struct nvkm_ior , struct nvkm_i2c_aux );		int g94_sor_dp_links(struct nvkm_ior , struct nvkm_i2c_aux );
	void g94_sor_dp_power(struct nvkm_ior *, int);		void g94_sor_dp_power(struct nvkm_ior *, int);
	void g94_sor_dp_pattern(struct nvkm_ior *, int);		void g94_sor_dp_pattern(struct nvkm_ior *, int);
			void g94_sor_dp_drive(struct nvkm_ior *, int, int, int, int, int);

	void gf119_sor_state(struct nvkm_ior , struct nvkm_ior_state );		void gf119_sor_state(struct nvkm_ior , struct nvkm_ior_state );
	int gf119_sor_dp_links(struct nvkm_ior , struct nvkm_i2c_aux );		int gf119_sor_dp_links(struct nvkm_ior , struct nvkm_i2c_aux );
	void gf119_sor_dp_pattern(struct nvkm_ior *, int);		void gf119_sor_dp_pattern(struct nvkm_ior *, int);
			void gf119_sor_dp_drive(struct nvkm_ior *, int, int, int, int, int);

	void gm107_sor_dp_pattern(struct nvkm_ior *, int);		void gm107_sor_dp_pattern(struct nvkm_ior *, int);

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -47,8 +47,6 @@ int nv50_sor_output_new(struct nvkm_disp , int, struct dcb_output ,
	int nv50_pior_output_new(struct nvkm_disp , int, struct dcb_output ,		int nv50_pior_output_new(struct nvkm_disp , int, struct dcb_output ,
	struct nvkm_output **);		struct nvkm_output **);

	u32 g94_sor_dp_lane_map(struct nvkm_device *, u8 lane);

	void gm200_sor_magic(struct nvkm_output *outp);		void gm200_sor_magic(struct nvkm_output *outp);

	#define OUTP_MSG(o,l,f,a...) do { \		#define OUTP_MSG(o,l,f,a...) do { \

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

+11 −48

Original line number	Original line	Diff line number	Diff line
	@@ -26,59 +26,22 @@

	#include <subdev/timer.h>		#include <subdev/timer.h>

	static inline u32		void
	g94_sor_soff(struct nvkm_output_dp *outp)		g94_sor_dp_drive(struct nvkm_ior *sor, int ln, int pc, int dc, int pe, int pu)
	{
	return (ffs(outp->base.info.or) - 1) * 0x800;
	}

	static inline u32
	g94_sor_loff(struct nvkm_output_dp *outp)
	{
	return g94_sor_soff(outp) + !(outp->base.info.sorconf.link & 1) * 0x80;
	}

	/*******************************************************************************
	* DisplayPort
	******************************************************************************/
	u32
	g94_sor_dp_lane_map(struct nvkm_device *device, u8 lane)
	{
	return nvkm_ior_find(device->disp, SOR, -1)->func->dp.lanes[lane] * 8;
	}

	static int
	g94_sor_dp_drv_ctl(struct nvkm_output_dp *outp, int ln, int vs, int pe, int pc)
	{		{
	struct nvkm_device *device = outp->base.disp->engine.subdev.device;		struct nvkm_device *device = sor->disp->engine.subdev.device;
	struct nvkm_bios *bios = device->bios;		const u32 loff = nv50_sor_link(sor);
	const u32 shift = g94_sor_dp_lane_map(device, ln);		const u32 shift = sor->func->dp.lanes[ln] * 8;
	const u32 loff = g94_sor_loff(outp);		u32 data[3];
	u32 addr, data[3];
	u8 ver, hdr, cnt, len;
	struct nvbios_dpout info;
	struct nvbios_dpcfg ocfg;

	addr = nvbios_dpout_match(bios, outp->base.info.hasht,
	outp->base.info.hashm,
	&ver, &hdr, &cnt, &len, &info);
	if (!addr)
	return -ENODEV;

	addr = nvbios_dpcfg_match(bios, addr, 0, vs, pe,
	&ver, &hdr, &cnt, &len, &ocfg);
	if (!addr)
	return -EINVAL;

	data[0] = nvkm_rd32(device, 0x61c118 + loff) & ~(0x000000ff << shift);		data[0] = nvkm_rd32(device, 0x61c118 + loff) & ~(0x000000ff << shift);
	data[1] = nvkm_rd32(device, 0x61c120 + loff) & ~(0x000000ff << shift);		data[1] = nvkm_rd32(device, 0x61c120 + loff) & ~(0x000000ff << shift);
	data[2] = nvkm_rd32(device, 0x61c130 + loff);		data[2] = nvkm_rd32(device, 0x61c130 + loff);
	if ((data[2] & 0x0000ff00) < (ocfg.tx_pu << 8) \|\| ln == 0)		if ((data[2] & 0x0000ff00) < (pu << 8) \|\| ln == 0)
	data[2] = (data[2] & ~0x0000ff00) \| (ocfg.tx_pu << 8);		data[2] = (data[2] & ~0x0000ff00) \| (pu << 8);
	nvkm_wr32(device, 0x61c118 + loff, data[0] \| (ocfg.dc << shift));		nvkm_wr32(device, 0x61c118 + loff, data[0] \| (dc << shift));
	nvkm_wr32(device, 0x61c120 + loff, data[1] \| (ocfg.pe << shift));		nvkm_wr32(device, 0x61c120 + loff, data[1] \| (pe << shift));
	nvkm_wr32(device, 0x61c130 + loff, data[2]);		nvkm_wr32(device, 0x61c130 + loff, data[2]);
	return 0;
	}		}

	void		void
	@@ -130,7 +93,6 @@ g94_sor_dp_links(struct nvkm_ior sor, struct nvkm_i2c_aux aux)

	static const struct nvkm_output_dp_func		static const struct nvkm_output_dp_func
	g94_sor_dp_func = {		g94_sor_dp_func = {
	.drv_ctl = g94_sor_dp_drv_ctl,
	};		};

	int		int
	@@ -298,6 +260,7 @@ g94_sor = {
	.links = g94_sor_dp_links,		.links = g94_sor_dp_links,
	.power = g94_sor_dp_power,		.power = g94_sor_dp_power,
	.pattern = g94_sor_dp_pattern,		.pattern = g94_sor_dp_pattern,
			.drive = g94_sor_dp_drive,
	},		},
	};		};