Skip to content

L
linux
Commit 476e84e1 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nv50-/disp: initial supervisor support for off-chip encoders 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a2bc283f
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 33 deletions
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
View file @ 476e84e1
...@@ -626,7 +626,7 @@ nv50_disp_base_init(struct nouveau_object *object) ...@@ -626,7 +626,7 @@ nv50_disp_base_init(struct nouveau_object *object)
nv_wr32(priv, 0x6101e0 + (i * 0x04), tmp); nv_wr32(priv, 0x6101e0 + (i * 0x04), tmp);
} }
/* ... EXT caps */ /* ... PIOR caps */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
tmp = nv_rd32(priv, 0x61e000 + (i * 0x800)); tmp = nv_rd32(priv, 0x61e000 + (i * 0x800));
nv_wr32(priv, 0x6101f0 + (i * 0x04), tmp); nv_wr32(priv, 0x6101f0 + (i * 0x04), tmp);
...@@ -783,8 +783,8 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl, ...@@ -783,8 +783,8 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl,
if (outp < 4) { if (outp < 4) {
type = DCB_OUTPUT_ANALOG; type = DCB_OUTPUT_ANALOG;
mask = 0; mask = 0;
} else { } else
outp -= 4; if (outp < 8) {
switch (ctrl & 0x00000f00) { switch (ctrl & 0x00000f00) {
case 0x00000000: type = DCB_OUTPUT_LVDS; mask = 1; break; case 0x00000000: type = DCB_OUTPUT_LVDS; mask = 1; break;
case 0x00000100: type = DCB_OUTPUT_TMDS; mask = 1; break; case 0x00000100: type = DCB_OUTPUT_TMDS; mask = 1; break;
...@@ -796,6 +796,17 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl, ...@@ -796,6 +796,17 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl,
nv_error(priv, "unknown SOR mc 0x%08x\n", ctrl); nv_error(priv, "unknown SOR mc 0x%08x\n", ctrl);
return 0x0000; return 0x0000;
} }
outp -= 4;
} else {
outp = outp - 8;
type = 0x0010;
mask = 0;
switch (ctrl & 0x00000f00) {
case 0x00000000: type |= priv->pior.type[outp]; break;
default:
nv_error(priv, "unknown PIOR mc 0x%08x\n", ctrl);
return 0x0000;
}
} }
mask = 0x00c0 & (mask << 6); mask = 0x00c0 & (mask << 6);
...@@ -806,6 +817,10 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl, ...@@ -806,6 +817,10 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl,
if (!data) if (!data)
return 0x0000; return 0x0000;
/* off-chip encoders require matching the exact encoder type */
if (dcb->location != 0)
type |= dcb->extdev << 8;
return nvbios_outp_match(bios, type, mask, ver, hdr, cnt, len, info); return nvbios_outp_match(bios, type, mask, ver, hdr, cnt, len, info);
} }
...@@ -820,9 +835,11 @@ exec_script(struct nv50_disp_priv *priv, int head, int id) ...@@ -820,9 +835,11 @@ exec_script(struct nv50_disp_priv *priv, int head, int id)
u32 ctrl = 0x00000000; u32 ctrl = 0x00000000;
int i; int i;
/* DAC */
for (i = 0; !(ctrl & (1 << head)) && i < 3; i++) for (i = 0; !(ctrl & (1 << head)) && i < 3; i++)
ctrl = nv_rd32(priv, 0x610b5c + (i * 8)); ctrl = nv_rd32(priv, 0x610b5c + (i * 8));
/* SOR */
if (!(ctrl & (1 << head))) { if (!(ctrl & (1 << head))) {
if (nv_device(priv)->chipset < 0x90 || if (nv_device(priv)->chipset < 0x90 ||
nv_device(priv)->chipset == 0x92 || nv_device(priv)->chipset == 0x92 ||
...@@ -837,6 +854,13 @@ exec_script(struct nv50_disp_priv *priv, int head, int id) ...@@ -837,6 +854,13 @@ exec_script(struct nv50_disp_priv *priv, int head, int id)
} }
} }
/* PIOR */
if (!(ctrl & (1 << head))) {
for (i = 0; !(ctrl & (1 << head)) && i < 3; i++)
ctrl = nv_rd32(priv, 0x610b84 + (i * 8));
i += 8;
}
if (!(ctrl & (1 << head))) if (!(ctrl & (1 << head)))
return false; return false;
i--; i--;
...@@ -870,9 +894,11 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, ...@@ -870,9 +894,11 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
u32 data, conf = ~0; u32 data, conf = ~0;
int i; int i;
/* DAC */
for (i = 0; !(ctrl & (1 << head)) && i < 3; i++) for (i = 0; !(ctrl & (1 << head)) && i < 3; i++)
ctrl = nv_rd32(priv, 0x610b58 + (i * 8)); ctrl = nv_rd32(priv, 0x610b58 + (i * 8));
/* SOR */
if (!(ctrl & (1 << head))) { if (!(ctrl & (1 << head))) {
if (nv_device(priv)->chipset < 0x90 || if (nv_device(priv)->chipset < 0x90 ||
nv_device(priv)->chipset == 0x92 || nv_device(priv)->chipset == 0x92 ||
...@@ -887,6 +913,13 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, ...@@ -887,6 +913,13 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
} }
} }
/* PIOR */
if (!(ctrl & (1 << head))) {
for (i = 0; !(ctrl & (1 << head)) && i < 3; i++)
ctrl = nv_rd32(priv, 0x610b80 + (i * 8));
i += 8;
}
if (!(ctrl & (1 << head))) if (!(ctrl & (1 << head)))
return conf; return conf;
i--; i--;
...@@ -895,22 +928,27 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, ...@@ -895,22 +928,27 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
if (!data) if (!data)
return conf; return conf;
switch (outp->type) { if (outp->location == 0) {
case DCB_OUTPUT_TMDS: switch (outp->type) {
conf = (ctrl & 0x00000f00) >> 8; case DCB_OUTPUT_TMDS:
if (pclk >= 165000) conf = (ctrl & 0x00000f00) >> 8;
conf |= 0x0100; if (pclk >= 165000)
break; conf |= 0x0100;
case DCB_OUTPUT_LVDS: break;
conf = priv->sor.lvdsconf; case DCB_OUTPUT_LVDS:
break; conf = priv->sor.lvdsconf;
case DCB_OUTPUT_DP: break;
case DCB_OUTPUT_DP:
conf = (ctrl & 0x00000f00) >> 8;
break;
case DCB_OUTPUT_ANALOG:
default:
conf = 0x00ff;
break;
}
} else {
conf = (ctrl & 0x00000f00) >> 8; conf = (ctrl & 0x00000f00) >> 8;
break; pclk = pclk / 2;
case DCB_OUTPUT_ANALOG:
default:
conf = 0x00ff;
break;
} }
data = nvbios_ocfg_match(bios, data, conf, &ver, &hdr, &cnt, &len, &info2); data = nvbios_ocfg_match(bios, data, conf, &ver, &hdr, &cnt, &len, &info2);
...@@ -1057,7 +1095,6 @@ static void ...@@ -1057,7 +1095,6 @@ static void
nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super) nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)
{ {
struct dcb_output outp; struct dcb_output outp;
u32 addr, mask, data;
int head; int head;
/* finish detaching encoder? */ /* finish detaching encoder? */
...@@ -1073,14 +1110,14 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super) ...@@ -1073,14 +1110,14 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)
struct nouveau_clock *clk = nouveau_clock(priv); struct nouveau_clock *clk = nouveau_clock(priv);
clk->pll_set(clk, PLL_VPLL0 + head, pclk); clk->pll_set(clk, PLL_VPLL0 + head, pclk);
} }
nv_mask(priv, 0x614200 + head * 0x800, 0x0000000f, 0x00000000);
} }
/* (re)attach the relevant OR to the head */ /* (re)attach the relevant OR to the head */
head = ffs((super & 0x00000180) >> 7) - 1; head = ffs((super & 0x00000180) >> 7) - 1;
if (head >= 0) { 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 oval, oreg;
u32 conf = exec_clkcmp(priv, head, 0xff, pclk, &outp); u32 conf = exec_clkcmp(priv, head, 0xff, pclk, &outp);
if (conf != ~0) { if (conf != ~0) {
if (outp.location == 0 && outp.type == DCB_OUTPUT_DP) { if (outp.location == 0 && outp.type == DCB_OUTPUT_DP) {
...@@ -1103,19 +1140,25 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super) ...@@ -1103,19 +1140,25 @@ nv50_disp_intr_unk20(struct nv50_disp_priv *priv, u32 super)
exec_clkcmp(priv, head, 0, pclk, &outp); exec_clkcmp(priv, head, 0, pclk, &outp);
if (outp.type == DCB_OUTPUT_ANALOG) { if (!outp.location && outp.type == DCB_OUTPUT_ANALOG) {
addr = 0x614280 + (ffs(outp.or) - 1) * 0x800; oreg = 0x614280 + (ffs(outp.or) - 1) * 0x800;
mask = 0xffffffff; oval = 0x00000000;
data = 0x00000000; hval = 0x00000000;
} else { } else
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_dp(priv, &outp, pclk);
addr = 0x614300 + (ffs(outp.or) - 1) * 0x800; oreg = 0x614300 + (ffs(outp.or) - 1) * 0x800;
mask = 0x00000707; oval = (conf & 0x0100) ? 0x0101 : 0x0000;
data = (conf & 0x0100) ? 0x0101 : 0x0000; hval = 0x00000000;
} else {
oreg = 0x614380 + (ffs(outp.or) - 1) * 0x800;
oval = 0x00000001;
hval = 0x00000001;
} }
nv_mask(priv, addr, mask, data); nv_mask(priv, hreg, 0x0000000f, hval);
nv_mask(priv, oreg, 0x00000707, oval);
} }
} }
...@@ -1151,9 +1194,28 @@ nv50_disp_intr_unk40(struct nv50_disp_priv *priv, u32 super) ...@@ -1151,9 +1194,28 @@ nv50_disp_intr_unk40(struct nv50_disp_priv *priv, u32 super)
if (head >= 0) { 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_tmds(priv, &outp);
else
if (outp.location == 1 && outp.type == DCB_OUTPUT_DP) {
u32 soff = (ffs(outp.or) - 1) * 0x08;
u32 ctrl = nv_rd32(priv, 0x610b84 + soff);
u32 datarate;
switch ((ctrl & 0x000f0000) >> 16) {
case 6: datarate = pclk * 30 / 8; break;
case 5: datarate = pclk * 24 / 8; break;
case 2:
default:
datarate = pclk * 18 / 8;
break;
}
nouveau_dp_train(&priv->base, priv->pior.dp,
&outp, head, datarate);
}
}
} }
nv_wr32(priv, 0x610030, 0x80000000); nv_wr32(priv, 0x610030, 0x80000000);
......
drivers/gpu/drm/nouveau/core/subdev/bios/init.c
View file @ 476e84e1
...@@ -231,6 +231,11 @@ init_i2c(struct nvbios_init *init, int index) ...@@ -231,6 +231,11 @@ init_i2c(struct nvbios_init *init, int index)
return NULL; return NULL;
} }
if (index == -2 && init->outp->location) {
index = NV_I2C_TYPE_EXTAUX(init->outp->extdev);
return i2c->find_type(i2c, index);
}
index = init->outp->i2c_index; index = init->outp->i2c_index;
} }
...@@ -258,7 +263,7 @@ init_wri2cr(struct nvbios_init *init, u8 index, u8 addr, u8 reg, u8 val) ...@@ -258,7 +263,7 @@ init_wri2cr(struct nvbios_init *init, u8 index, u8 addr, u8 reg, u8 val)
static int static int
init_rdauxr(struct nvbios_init *init, u32 addr) init_rdauxr(struct nvbios_init *init, u32 addr)
{ {
struct nouveau_i2c_port *port = init_i2c(init, -1); struct nouveau_i2c_port *port = init_i2c(init, -2);
u8 data; u8 data;
if (port && init_exec(init)) { if (port && init_exec(init)) {
...@@ -274,7 +279,7 @@ init_rdauxr(struct nvbios_init *init, u32 addr) ...@@ -274,7 +279,7 @@ init_rdauxr(struct nvbios_init *init, u32 addr)
static int static int
init_wrauxr(struct nvbios_init *init, u32 addr, u8 data) init_wrauxr(struct nvbios_init *init, u32 addr, u8 data)
{ {
struct nouveau_i2c_port *port = init_i2c(init, -1); struct nouveau_i2c_port *port = init_i2c(init, -2);
if (port && init_exec(init)) if (port && init_exec(init))
return nv_wraux(port, addr, &data, 1); return nv_wraux(port, addr, &data, 1);
return -ENODEV; return -ENODEV;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7