UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nv50/disp: start removing direct vbios parsing from supervisor 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-05-21 11:24:43 +10:00
parent bb7ef1ec2e
commit 415f12efc1
1 changed files with 115 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
View File

@ -1114,19 +1114,20 @@ nv50_disp_intr_error(struct nv50_disp_priv *priv, int chid)
nv_wr32(priv, 0x610080 + (chid * 0x08), 0x90000000); nv_wr32(priv, 0x610080 + (chid * 0x08), 0x90000000);
} }
static u16 static struct nvkm_output *
exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl, exec_lookup(struct nv50_disp_priv *priv, int head, int or, u32 ctrl,
struct dcb_output *dcb, u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u32 *data, u8 *ver, u8 *hdr, u8 *cnt, u8 *len,
struct nvbios_outp *info) struct nvbios_outp *info)
{ {
struct nouveau_bios *bios = nouveau_bios(priv); struct nouveau_bios *bios = nouveau_bios(priv);
u16 mask, type, data; struct nvkm_output *outp;
u16 mask, type;
if (outp < 4) { if (or < 4) {
type = DCB_OUTPUT_ANALOG; type = DCB_OUTPUT_ANALOG;
mask = 0; mask = 0;
} else } else
if (outp < 8) { if (or < 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;
@ -1136,45 +1137,48 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int outp, u32 ctrl,
case 0x00000900: type = DCB_OUTPUT_DP; mask = 2; break; case 0x00000900: type = DCB_OUTPUT_DP; mask = 2; break;
default: default:
nv_error(priv, "unknown SOR mc 0x%08x\n", ctrl); nv_error(priv, "unknown SOR mc 0x%08x\n", ctrl);
return 0x0000; return NULL;
} }
outp -= 4; or -= 4;
} else { } else {
outp = outp - 8; or = or - 8;
type = 0x0010; type = 0x0010;
mask = 0; mask = 0;
switch (ctrl & 0x00000f00) { switch (ctrl & 0x00000f00) {
case 0x00000000: type |= priv->pior.type[outp]; break; case 0x00000000: type |= priv->pior.type[or]; break;
default: default:
nv_error(priv, "unknown PIOR mc 0x%08x\n", ctrl); nv_error(priv, "unknown PIOR mc 0x%08x\n", ctrl);
return 0x0000; return NULL;
} }
} }
mask = 0x00c0 & (mask << 6); mask = 0x00c0 & (mask << 6);
mask |= 0x0001 << outp; mask |= 0x0001 << or;
mask |= 0x0100 << head; mask |= 0x0100 << head;
data = dcb_outp_match(bios, type, mask, ver, hdr, dcb); list_for_each_entry(outp, &priv->base.outp, head) {
if (!data) if ((outp->info.hasht & 0xff) == type &&
return 0x0000; (outp->info.hashm & mask) == mask) {
*data = nvbios_outp_match(bios, outp->info.hasht,
outp->info.hashm,
ver, hdr, cnt, len, info);
if (!*data)
return NULL;
return outp;
}
}
/* off-chip encoders require matching the exact encoder type */ return NULL;
if (dcb->location != 0)
type |= dcb->extdev << 8;
return nvbios_outp_match(bios, type, mask, ver, hdr, cnt, len, info);
} }
static bool static bool
exec_script(struct nv50_disp_priv *priv, int head, int id) exec_script(struct nv50_disp_priv *priv, int head, int id)
{ {
struct nouveau_bios *bios = nouveau_bios(priv); struct nouveau_bios *bios = nouveau_bios(priv);
struct nvkm_output *outp;
struct nvbios_outp info; struct nvbios_outp info;
struct dcb_output dcb;
u8 ver, hdr, cnt, len; u8 ver, hdr, cnt, len;
u16 data; u32 data, ctrl = 0;
u32 ctrl = 0x00000000;
u32 reg; u32 reg;
int i; int i;
@ -1207,13 +1211,13 @@ exec_script(struct nv50_disp_priv *priv, int head, int id)
return false; return false;
i--; i--;
data = exec_lookup(priv, head, i, ctrl, &dcb, &ver, &hdr, &cnt, &len, &info); outp = exec_lookup(priv, head, i, ctrl, &data, &ver, &hdr, &cnt, &len, &info);
if (data) { if (outp) {
struct nvbios_init init = { struct nvbios_init init = {
.subdev = nv_subdev(priv), .subdev = nv_subdev(priv),
.bios = bios, .bios = bios,
.offset = info.script[id], .offset = info.script[id],
.outp = &dcb, .outp = &outp->info,
.crtc = head, .crtc = head,
.execute = 1, .execute = 1,
}; };
@ -1224,16 +1228,15 @@ exec_script(struct nv50_disp_priv *priv, int head, int id)
return false; return false;
} }
static u32 static struct nvkm_output *
exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, u32 *conf)
struct dcb_output *outp)
{ {
struct nouveau_bios *bios = nouveau_bios(priv); struct nouveau_bios *bios = nouveau_bios(priv);
struct nvkm_output *outp;
struct nvbios_outp info1; struct nvbios_outp info1;
struct nvbios_ocfg info2; struct nvbios_ocfg info2;
u8 ver, hdr, cnt, len; u8 ver, hdr, cnt, len;
u32 ctrl = 0x00000000; u32 data, ctrl = 0;
u32 data, conf = ~0;
u32 reg; u32 reg;
int i; int i;
@ -1263,37 +1266,37 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
} }
if (!(ctrl & (1 << head))) if (!(ctrl & (1 << head)))
return conf; return NULL;
i--; i--;
data = exec_lookup(priv, head, i, ctrl, outp, &ver, &hdr, &cnt, &len, &info1); outp = exec_lookup(priv, head, i, ctrl, &data, &ver, &hdr, &cnt, &len, &info1);
if (!data) if (!data)
return conf; return NULL;
if (outp->location == 0) { if (outp->info.location == 0) {
switch (outp->type) { switch (outp->info.type) {
case DCB_OUTPUT_TMDS: case DCB_OUTPUT_TMDS:
conf = (ctrl & 0x00000f00) >> 8; *conf = (ctrl & 0x00000f00) >> 8;
if (pclk >= 165000) if (pclk >= 165000)
conf |= 0x0100; *conf |= 0x0100;
break; break;
case DCB_OUTPUT_LVDS: case DCB_OUTPUT_LVDS:
conf = priv->sor.lvdsconf; *conf = priv->sor.lvdsconf;
break; break;
case DCB_OUTPUT_DP: case DCB_OUTPUT_DP:
conf = (ctrl & 0x00000f00) >> 8; *conf = (ctrl & 0x00000f00) >> 8;
break; break;
case DCB_OUTPUT_ANALOG: case DCB_OUTPUT_ANALOG:
default: default:
conf = 0x00ff; *conf = 0x00ff;
break; break;
} }
} else { } else {
conf = (ctrl & 0x00000f00) >> 8; *conf = (ctrl & 0x00000f00) >> 8;
pclk = pclk / 2; pclk = pclk / 2;
} }
data = nvbios_ocfg_match(bios, data, conf, &ver, &hdr, &cnt, &len, &info2); data = nvbios_ocfg_match(bios, data, *conf, &ver, &hdr, &cnt, &len, &info2);
if (data && id < 0xff) { if (data && id < 0xff) {
data = nvbios_oclk_match(bios, info2.clkcmp[id], pclk); data = nvbios_oclk_match(bios, info2.clkcmp[id], pclk);
if (data) { if (data) {
@ -1301,7 +1304,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
.subdev = nv_subdev(priv), .subdev = nv_subdev(priv),
.bios = bios, .bios = bios,
.offset = data, .offset = data,
.outp = outp, .outp = &outp->info,
.crtc = head, .crtc = head,
.execute = 1, .execute = 1,
}; };
@ -1310,7 +1313,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk,
} }
} }
return conf; return outp;
} }
static void static void
@ -1444,15 +1447,18 @@ nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,
static void static void
nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head) nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head)
{ {
struct dcb_output outp; struct nvkm_output *outp;
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;
u32 mask; u32 mask, conf;
u32 conf = exec_clkcmp(priv, head, 0xff, pclk, &outp);
if (conf != ~0) { outp = exec_clkcmp(priv, head, 0xff, pclk, &conf);
if (outp.location == 0 && outp.type == DCB_OUTPUT_DP) { if (!outp)
u32 soff = (ffs(outp.or) - 1) * 0x08; return;
if (outp->info.location == 0 && outp->info.type == DCB_OUTPUT_DP) {
u32 soff = (ffs(outp->info.or) - 1) * 0x08;
u32 ctrl = nv_rd32(priv, 0x610794 + soff); u32 ctrl = nv_rd32(priv, 0x610794 + soff);
u32 datarate; u32 datarate;
@ -1466,26 +1472,26 @@ nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head)
} }
nouveau_dp_train(&priv->base, priv->sor.dp, nouveau_dp_train(&priv->base, priv->sor.dp,
&outp, head, datarate); &outp->info, head, datarate);
} }
exec_clkcmp(priv, head, 0, pclk, &outp); exec_clkcmp(priv, head, 0, pclk, &conf);
if (!outp.location && outp.type == DCB_OUTPUT_ANALOG) { if (!outp->info.location && outp->info.type == DCB_OUTPUT_ANALOG) {
oreg = 0x614280 + (ffs(outp.or) - 1) * 0x800; oreg = 0x614280 + (ffs(outp->info.or) - 1) * 0x800;
oval = 0x00000000; oval = 0x00000000;
hval = 0x00000000; hval = 0x00000000;
mask = 0xffffffff; mask = 0xffffffff;
} else } else
if (!outp.location) { if (!outp->info.location) {
if (outp.type == DCB_OUTPUT_DP) if (outp->info.type == DCB_OUTPUT_DP)
nv50_disp_intr_unk20_2_dp(priv, &outp, pclk); nv50_disp_intr_unk20_2_dp(priv, &outp->info, pclk);
oreg = 0x614300 + (ffs(outp.or) - 1) * 0x800; oreg = 0x614300 + (ffs(outp->info.or) - 1) * 0x800;
oval = (conf & 0x0100) ? 0x00000101 : 0x00000000; oval = (conf & 0x0100) ? 0x00000101 : 0x00000000;
hval = 0x00000000; hval = 0x00000000;
mask = 0x00000707; mask = 0x00000707;
} else { } else {
oreg = 0x614380 + (ffs(outp.or) - 1) * 0x800; oreg = 0x614380 + (ffs(outp->info.or) - 1) * 0x800;
oval = 0x00000001; oval = 0x00000001;
hval = 0x00000001; hval = 0x00000001;
mask = 0x00000707; mask = 0x00000707;
@ -1493,7 +1499,6 @@ nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head)
nv_mask(priv, hreg, 0x0000000f, hval); nv_mask(priv, hreg, 0x0000000f, hval);
nv_mask(priv, oreg, mask, oval); nv_mask(priv, oreg, mask, oval);
}
} }
/* 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
@ -1521,14 +1526,19 @@ nv50_disp_intr_unk40_0_tmds(struct nv50_disp_priv *priv, struct dcb_output *outp
static void static void
nv50_disp_intr_unk40_0(struct nv50_disp_priv *priv, int head) nv50_disp_intr_unk40_0(struct nv50_disp_priv *priv, int head)
{ {
struct dcb_output outp; struct nvkm_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) { u32 conf;
if (outp.location == 0 && outp.type == DCB_OUTPUT_TMDS)
nv50_disp_intr_unk40_0_tmds(priv, &outp); outp = exec_clkcmp(priv, head, 1, pclk, &conf);
if (!outp)
return;
if (outp->info.location == 0 && outp->info.type == DCB_OUTPUT_TMDS)
nv50_disp_intr_unk40_0_tmds(priv, &outp->info);
else else
if (outp.location == 1 && outp.type == DCB_OUTPUT_DP) { if (outp->info.location == 1 && outp->info.type == DCB_OUTPUT_DP) {
u32 soff = (ffs(outp.or) - 1) * 0x08; u32 soff = (ffs(outp->info.or) - 1) * 0x08;
u32 ctrl = nv_rd32(priv, 0x610b84 + soff); u32 ctrl = nv_rd32(priv, 0x610b84 + soff);
u32 datarate; u32 datarate;
@ -1542,8 +1552,7 @@ nv50_disp_intr_unk40_0(struct nv50_disp_priv *priv, int head)
} }
nouveau_dp_train(&priv->base, priv->pior.dp, nouveau_dp_train(&priv->base, priv->pior.dp,
&outp, head, datarate); &outp->info, head, datarate);
}
} }
} }