Commit a3e81117 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp/g94-: port OR DP link power control to nvkm_ior 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7dc0bac4

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

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ nvkm_dp_train_links(struct nvkm_dp *dp) 
		return 0;

	}



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

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



	/* Set desired link configuration on the sink. */

	sink[0] = ior->dp.bw;

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

+0 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct nvkm_dp { 


struct nvkm_output_dp_func {

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

	int (*lnk_pwr)(struct nvkm_output_dp *, int nr);

	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,

		     u8 num_slots, u16 pbn, u16 aligned_pbn);
@@ -50,7 +49,6 @@ int nv50_pior_dp_new(struct nvkm_disp *, int, struct dcb_output *, 


int g94_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,

		   struct nvkm_output **);

int g94_sor_dp_lnk_pwr(struct nvkm_dp *, int);



int gf119_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,

		     struct nvkm_output **);

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

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct nvkm_ior_func { 
	struct {

		u8 lanes[4];

		int (*links)(struct nvkm_ior *, struct nvkm_i2c_aux *);

		void (*power)(struct nvkm_ior *, int nr);

	} dp;

};
@@ -82,6 +83,7 @@ void nv50_sor_power(struct nvkm_ior *, bool, bool, bool, bool, bool); 


void g94_sor_state(struct nvkm_ior *, struct nvkm_ior_state *);

int g94_sor_dp_links(struct nvkm_ior *, struct nvkm_i2c_aux *);

void g94_sor_dp_power(struct nvkm_ior *, int);



void gf119_sor_state(struct nvkm_ior *, struct nvkm_ior_state *);

int gf119_sor_dp_links(struct nvkm_ior *, struct nvkm_i2c_aux *);

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

+0 −7
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ nv50_pior_output_dp_pattern(struct nvkm_output_dp *outp, int pattern) 
	return 0;

}



static int

nv50_pior_output_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)

{

	return 0;

}



static int

nv50_pior_dp_links(struct nvkm_ior *pior, struct nvkm_i2c_aux *aux)

{
@@ -70,7 +64,6 @@ nv50_pior_dp_links(struct nvkm_ior *pior, struct nvkm_i2c_aux *aux) 
static const struct nvkm_output_dp_func

nv50_pior_output_dp_func = {

	.pattern = nv50_pior_output_dp_pattern,

	.lnk_pwr = nv50_pior_output_dp_lnk_pwr,

};



int

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

+7 −8
Original line number Diff line number Diff line
@@ -90,16 +90,16 @@ g94_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern) 
	return 0;

}



int

g94_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)

void

g94_sor_dp_power(struct nvkm_ior *sor, int nr)

{

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

	const u32 soff = g94_sor_soff(outp);

	const u32 loff = g94_sor_loff(outp);

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

	const u32 soff = nv50_ior_base(sor);

	const u32 loff = nv50_sor_link(sor);

	u32 mask = 0, i;



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

		mask |= 1 << (g94_sor_dp_lane_map(device, i) >> 3);

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



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

	nvkm_mask(device, 0x61c034 + soff, 0x80000000, 0x80000000);
@@ -107,7 +107,6 @@ g94_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr) 
		if (!(nvkm_rd32(device, 0x61c034 + soff) & 0x80000000))

			break;

	);

	return 0;

}



int
@@ -133,7 +132,6 @@ g94_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux) 
static const struct nvkm_output_dp_func

g94_sor_dp_func = {

	.pattern = g94_sor_dp_pattern,

	.lnk_pwr = g94_sor_dp_lnk_pwr,

	.drv_ctl = g94_sor_dp_drv_ctl,

};
@@ -300,6 +298,7 @@ g94_sor = { 
	.dp = {

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

		.links = g94_sor_dp_links,

		.power = g94_sor_dp_power,

	},

};