Commit 9a4514fb authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/disp: split sor dp funcs out to their own struct 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 79c453af

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

+4 −4
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ nvkm_dp_train_drive(struct lt_state *lt, bool pc) 
		if (!data)

			continue;



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

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

	}



	if (lt->repeater)
@@ -171,7 +171,7 @@ nvkm_dp_train_pattern(struct lt_state *lt, u8 pattern) 
	u8 sink_tp;



	OUTP_TRACE(outp, "training pattern %d", pattern);

	outp->ior->func->dp.pattern(outp->ior, pattern);

	outp->ior->func->dp->pattern(outp->ior, pattern);



	if (lt->repeater)

		addr = DPCD_LTTPR_PATTERN_SET(lt->repeater);
@@ -328,7 +328,7 @@ nvkm_dp_train_links(struct nvkm_outp *outp, int rate) 
		);

	}



	ret = ior->func->dp.links(ior, outp->dp.aux);

	ret = ior->func->dp->links(ior, outp->dp.aux);

	if (ret) {

		if (ret < 0) {

			OUTP_ERR(outp, "train failed with %d", ret);
@@ -337,7 +337,7 @@ nvkm_dp_train_links(struct nvkm_outp *outp, int rate) 
		return 0;

	}



	ior->func->dp.power(ior, ior->dp.nr);

	ior->func->dp->power(ior, ior->dp.nr);



	/* Select LTTPR non-transparent mode if we have a valid configuration,

	 * use transparent mode otherwise.

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

+15 −12
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ g94_sor_dp_drive(struct nvkm_ior *sor, int ln, int pc, int dc, int pe, int pu) 
{

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

	const u32  loff = nv50_sor_link(sor);

	const u32 shift = sor->func->dp.lanes[ln] * 8;

	const u32 shift = sor->func->dp->lanes[ln] * 8;

	u32 data[3];



	data[0] = nvkm_rd32(device, 0x61c118 + loff) & ~(0x000000ff << shift);
@@ -107,7 +107,7 @@ g94_sor_dp_power(struct nvkm_ior *sor, int nr) 
	u32 mask = 0, i;



	for (i = 0; i < nr; i++)

		mask |= 1 << sor->func->dp.lanes[i];

		mask |= 1 << sor->func->dp->lanes[i];



	nvkm_mask(device, 0x61c130 + loff, 0x0000000f, mask);

	nvkm_mask(device, 0x61c034 + soff, 0x80000000, 0x80000000);
@@ -137,6 +137,18 @@ g94_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux) 
	return 0;

}



const struct nvkm_ior_func_dp

g94_sor_dp = {

	.lanes = { 2, 1, 0, 3},

	.links = g94_sor_dp_links,

	.power = g94_sor_dp_power,

	.pattern = g94_sor_dp_pattern,

	.drive = g94_sor_dp_drive,

	.audio_sym = g94_sor_dp_audio_sym,

	.activesym = g94_sor_dp_activesym,

	.watermark = g94_sor_dp_watermark,

};



static bool

g94_sor_war_needed(struct nvkm_ior *sor)

{
@@ -283,16 +295,7 @@ g94_sor = { 
	.clock = nv50_sor_clock,

	.war_2 = g94_sor_war_2,

	.war_3 = g94_sor_war_3,

	.dp = {

		.lanes = { 2, 1, 0, 3},

		.links = g94_sor_dp_links,

		.power = g94_sor_dp_power,

		.pattern = g94_sor_dp_pattern,

		.drive = g94_sor_dp_drive,

		.audio_sym = g94_sor_dp_audio_sym,

		.activesym = g94_sor_dp_activesym,

		.watermark = g94_sor_dp_watermark,

	},

	.dp = &g94_sor_dp,

};



static int

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

+14 −11
Original line number Diff line number Diff line
@@ -68,6 +68,19 @@ ga102_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux) 
	return 0;

}



static const struct nvkm_ior_func_dp

ga102_sor_dp = {

	.lanes = { 0, 1, 2, 3 },

	.links = ga102_sor_dp_links,

	.power = g94_sor_dp_power,

	.pattern = gm107_sor_dp_pattern,

	.drive = gm200_sor_dp_drive,

	.vcpi = tu102_sor_dp_vcpi,

	.audio = gv100_sor_dp_audio,

	.audio_sym = gv100_sor_dp_audio_sym,

	.watermark = gv100_sor_dp_watermark,

};



static void

ga102_sor_clock(struct nvkm_ior *sor)

{
@@ -96,17 +109,7 @@ ga102_sor = { 
		.ctrl = gv100_sor_hdmi_ctrl,

		.scdc = gm200_sor_hdmi_scdc,

	},

	.dp = {

		.lanes = { 0, 1, 2, 3 },

		.links = ga102_sor_dp_links,

		.power = g94_sor_dp_power,

		.pattern = gm107_sor_dp_pattern,

		.drive = gm200_sor_dp_drive,

		.vcpi = tu102_sor_dp_vcpi,

		.audio = gv100_sor_dp_audio,

		.audio_sym = gv100_sor_dp_audio_sym,

		.watermark = gv100_sor_dp_watermark,

	},

	.dp = &ga102_sor_dp,

	.hda = {

		.hpd = gf119_sor_hda_hpd,

		.eld = gf119_sor_hda_eld,

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

+16 −13
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ gf119_sor_dp_drive(struct nvkm_ior *sor, int ln, int pc, int dc, int pe, int pu) 
{

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

	const u32  loff = nv50_sor_link(sor);

	const u32 shift = sor->func->dp.lanes[ln] * 8;

	const u32 shift = sor->func->dp->lanes[ln] * 8;

	u32 data[4];



	data[0] = nvkm_rd32(device, 0x61c118 + loff) & ~(0x000000ff << shift);
@@ -140,7 +140,7 @@ gf119_sor_dp_drive(struct nvkm_ior *sor, int ln, int pc, int dc, int pe, int pu) 
	nvkm_wr32(device, 0x61c13c + loff, data[3] | (pc << shift));

}



void

static void

gf119_sor_dp_pattern(struct nvkm_ior *sor, int pattern)

{

	struct nvkm_device *device = sor->disp->engine.subdev.device;
@@ -181,6 +181,19 @@ gf119_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux) 
	return 0;

}



const struct nvkm_ior_func_dp

gf119_sor_dp = {

	.lanes = { 2, 1, 0, 3 },

	.links = gf119_sor_dp_links,

	.power = g94_sor_dp_power,

	.pattern = gf119_sor_dp_pattern,

	.drive = gf119_sor_dp_drive,

	.vcpi = gf119_sor_dp_vcpi,

	.audio = gf119_sor_dp_audio,

	.audio_sym = gf119_sor_dp_audio_sym,

	.watermark = gf119_sor_dp_watermark,

};



static void

gf119_sor_hdmi_ctrl(struct nvkm_ior *ior, int head, bool enable, u8 max_ac_packet,

		    u8 rekey, u8 *avi, u8 avi_size, u8 *vendor, u8 vendor_size)
@@ -288,17 +301,7 @@ gf119_sor = { 
	.hdmi = {

		.ctrl = gf119_sor_hdmi_ctrl,

	},

	.dp = {

		.lanes = { 2, 1, 0, 3 },

		.links = gf119_sor_dp_links,

		.power = g94_sor_dp_power,

		.pattern = gf119_sor_dp_pattern,

		.drive = gf119_sor_dp_drive,

		.vcpi = gf119_sor_dp_vcpi,

		.audio = gf119_sor_dp_audio,

		.audio_sym = gf119_sor_dp_audio_sym,

		.watermark = gf119_sor_dp_watermark,

	},

	.dp = &gf119_sor_dp,

	.hda = {

		.hpd = gf119_sor_hda_hpd,

		.eld = gf119_sor_hda_eld,

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

+1 −11
Original line number Diff line number Diff line
@@ -95,17 +95,7 @@ gk104_sor = { 
	.hdmi = {

		.ctrl = gk104_sor_hdmi_ctrl,

	},

	.dp = {

		.lanes = { 2, 1, 0, 3 },

		.links = gf119_sor_dp_links,

		.power = g94_sor_dp_power,

		.pattern = gf119_sor_dp_pattern,

		.drive = gf119_sor_dp_drive,

		.vcpi = gf119_sor_dp_vcpi,

		.audio = gf119_sor_dp_audio,

		.audio_sym = gf119_sor_dp_audio_sym,

		.watermark = gf119_sor_dp_watermark,

	},

	.dp = &gf119_sor_dp,

	.hda = {

		.hpd = gf119_sor_hda_hpd,

		.eld = gf119_sor_hda_eld,