Commit 16d4c031 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50/disp: handle multiple actions from one set of supervisor intrs 



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

drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

+118 −108
Original line number Original line Diff line number Diff line
@@ -972,20 +972,28 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, 
}

}





static void

static void

nv50_disp_intr_unk10(struct nv50_disp_priv *priv, u32 super)

nv50_disp_intr_unk10_0(struct nv50_disp_priv *priv, int head)

{

{

	int head = ffs((super & 0x00000060) >> 5) - 1;

	if (head >= 0) {

		head = ffs((super & 0x00000180) >> 7) - 1;

		if (head >= 0)

	exec_script(priv, head, 1);

	exec_script(priv, head, 1);

}

}





	nv_wr32(priv, 0x610030, 0x80000000);

static void

nv50_disp_intr_unk20_0(struct nv50_disp_priv *priv, int head)

{

	exec_script(priv, head, 2);

}



static void

nv50_disp_intr_unk20_1(struct nv50_disp_priv *priv, int head)

{

	struct nouveau_clock *clk = nouveau_clock(priv);

	u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;

	if (pclk)

		clk->pll_set(clk, PLL_VPLL0 + head, pclk);

}

}





static void

static void

nv50_disp_intr_unk20_dp(struct nv50_disp_priv *priv,

nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,

			  struct dcb_output *outp, u32 pclk)

			  struct dcb_output *outp, u32 pclk)

{

{

	const int link = !(outp->sorconf.link & 1);

	const int link = !(outp->sorconf.link & 1);
@@ -1092,29 +1100,9 @@ nv50_disp_intr_unk20_dp(struct nv50_disp_priv *priv, 
}

}





static void

static void

nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)

nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head)

{

{

	struct dcb_output outp;

	struct dcb_output outp;

	int head;



	/* finish detaching encoder? */

	head = ffs((super & 0x00000180) >> 7) - 1;

	if (head >= 0)

		exec_script(priv, head, 2);



	/* check whether a vpll change is required */

	head = ffs((super & 0x00000600) >> 9) - 1;

	if (head >= 0) {

		u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;

		if (pclk) {

			struct nouveau_clock *clk = nouveau_clock(priv);

			clk->pll_set(clk, PLL_VPLL0 + head, pclk);

		}

	}



	/* (re)attach the relevant OR to the head */

	head = ffs((super & 0x00000180) >> 7) - 1;

	if (head >= 0) {

	u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;

	u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;

	u32 hval, hreg = 0x614200 + (head * 0x800);

	u32 hval, hreg = 0x614200 + (head * 0x800);

	u32 oval, oreg;

	u32 oval, oreg;
@@ -1147,9 +1135,9 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super) 
		} else

		} else

		if (!outp.location) {

		if (!outp.location) {

			if (outp.type == DCB_OUTPUT_DP)

			if (outp.type == DCB_OUTPUT_DP)

					nv50_disp_intr_unk20_dp(priv, &outp, pclk);

				nv50_disp_intr_unk20_2_dp(priv, &outp, pclk);

			oreg = 0x614300 + (ffs(outp.or) - 1) * 0x800;

			oreg = 0x614300 + (ffs(outp.or) - 1) * 0x800;

				oval = (conf & 0x0100) ? 0x0101 : 0x0000;

			oval = (conf & 0x0100) ? 0x00000101 : 0x00000000;

			hval = 0x00000000;

			hval = 0x00000000;

		} else {

		} else {

			oreg = 0x614380 + (ffs(outp.or) - 1) * 0x800;

			oreg = 0x614380 + (ffs(outp.or) - 1) * 0x800;
@@ -1162,9 +1150,6 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super) 
	}

	}

}

}





	nv_wr32(priv, 0x610030, 0x80000000);

}



/* If programming a TMDS output on a SOR that can also be configured for

/* If programming a TMDS output on a SOR that can also be configured for

 * DisplayPort, make sure NV50_SOR_DP_CTRL_ENABLE is forced off.

 * DisplayPort, make sure NV50_SOR_DP_CTRL_ENABLE is forced off.

 *

 *
@@ -1174,7 +1159,7 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super) 
 * programmed for DisplayPort.

 * programmed for DisplayPort.

 */

 */

static void

static void

nv50_disp_intr_unk40_tmds(struct nv50_disp_priv *priv, struct dcb_output *outp)

nv50_disp_intr_unk40_0_tmds(struct nv50_disp_priv *priv, struct dcb_output *outp)

{

{

	struct nouveau_bios *bios = nouveau_bios(priv);

	struct nouveau_bios *bios = nouveau_bios(priv);

	const int link = !(outp->sorconf.link & 1);

	const int link = !(outp->sorconf.link & 1);
@@ -1188,15 +1173,13 @@ nv50_disp_intr_unk40_tmds(struct nv50_disp_priv *priv, struct dcb_output *outp) 
}

}





static void

static void

nv50_disp_intr_unk40(struct nv50_disp_priv *priv, u32 super)

nv50_disp_intr_unk40_0(struct nv50_disp_priv *priv, int head)

{

{

	int head = ffs((super & 0x00000180) >> 7) - 1;

	if (head >= 0) {

	struct dcb_output outp;

	struct dcb_output outp;

	u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;

	u32 pclk = nv_rd32(priv, 0x610ad0 + (head * 0x540)) & 0x3fffff;

	if (exec_clkcmp(priv, head, 1, pclk, &outp) != ~0) {

	if (exec_clkcmp(priv, head, 1, pclk, &outp) != ~0) {

		if (outp.location == 0 && outp.type == DCB_OUTPUT_TMDS)

		if (outp.location == 0 && outp.type == DCB_OUTPUT_TMDS)

				nv50_disp_intr_unk40_tmds(priv, &outp);

			nv50_disp_intr_unk40_0_tmds(priv, &outp);

		else

		else

		if (outp.location == 1 && outp.type == DCB_OUTPUT_DP) {

		if (outp.location == 1 && outp.type == DCB_OUTPUT_DP) {

			u32 soff = (ffs(outp.or) - 1) * 0x08;

			u32 soff = (ffs(outp.or) - 1) * 0x08;
@@ -1218,24 +1201,51 @@ nv50_disp_intr_unk40(struct nv50_disp_priv *priv, u32 super) 
	}

	}

}

}





	nv_wr32(priv, 0x610030, 0x80000000);

}



void

void

nv50_disp_intr_supervisor(struct work_struct *work)

nv50_disp_intr_supervisor(struct work_struct *work)

{

{

	struct nv50_disp_priv *priv =

	struct nv50_disp_priv *priv =

		container_of(work, struct nv50_disp_priv, supervisor);

		container_of(work, struct nv50_disp_priv, supervisor);

	u32 super = nv_rd32(priv, 0x610030);

	u32 super = nv_rd32(priv, 0x610030);

	int head;





	nv_debug(priv, "supervisor 0x%08x 0x%08x\n", priv->super, super);

	nv_debug(priv, "supervisor 0x%08x 0x%08x\n", priv->super, super);





	if (priv->super & 0x00000010)

	if (priv->super & 0x00000010) {

		nv50_disp_intr_unk10(priv, super);

		for (head = 0; head < priv->head.nr; head++) {

	if (priv->super & 0x00000020)

			if (!(super & (0x00000020 << head)))

		nv50_disp_intr_unk20(priv, super);

				continue;

	if (priv->super & 0x00000040)

			if (!(super & (0x00000080 << head)))

		nv50_disp_intr_unk40(priv, super);

				continue;

			nv50_disp_intr_unk10_0(priv, head);

		}

	} else

	if (priv->super & 0x00000020) {

		for (head = 0; head < priv->head.nr; head++) {

			if (!(super & (0x00000080 << head)))

				continue;

			nv50_disp_intr_unk20_0(priv, head);

		}

		for (head = 0; head < priv->head.nr; head++) {

			if (!(super & (0x00000200 << head)))

				continue;

			nv50_disp_intr_unk20_1(priv, head);

		}

		for (head = 0; head < priv->head.nr; head++) {

			if (!(super & (0x00000080 << head)))

				continue;

			nv50_disp_intr_unk20_2(priv, head);

		}

	} else

	if (priv->super & 0x00000040) {

		for (head = 0; head < priv->head.nr; head++) {

			if (!(super & (0x00000080 << head)))

				continue;

			nv50_disp_intr_unk40_0(priv, head);

		}

	}



	nv_wr32(priv, 0x610030, 0x80000000);

}

}





void

void