renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-07 05:04:04 +08:00
Code

drm/nouveau/disp/nv50-: fetch mask of available piors during oneinit

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2018-05-08 20:39:46 +10:00
parent 9fe4e17704
commit f5e088d6f0
11 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
View File

@ -35,7 +35,7 @@ g84_disp = {
.head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
.dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
.sor = { .cnt = nv50_sor_cnt, .new = g84_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new },
.pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
};
int

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
View File

@ -35,7 +35,7 @@ g94_disp = {
.head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
.dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
.sor = { .cnt = g94_sor_cnt, .new = g94_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new },
.pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
};
int

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
View File

@ -35,7 +35,7 @@ gt200_disp = {
.head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
.dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
.sor = { .cnt = nv50_sor_cnt, .new = g84_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new },
.pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
};
int

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
View File

@ -35,7 +35,7 @@ gt215_disp = {
.head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
.dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
.sor = { .cnt = g94_sor_cnt, .new = gt215_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new },
.pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
};
int

1
drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
View File

@ -157,6 +157,7 @@ int nv50_dac_new(struct nvkm_disp *, int);
int gf119_dac_cnt(struct nvkm_disp *, unsigned long *);
int gf119_dac_new(struct nvkm_disp *, int);
int nv50_pior_cnt(struct nvkm_disp *, unsigned long *);
int nv50_pior_new(struct nvkm_disp *, int);
int nv50_sor_cnt(struct nvkm_disp *, unsigned long *);

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
View File

@ -33,7 +33,7 @@ mcp77_disp = {
.head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
.dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
.sor = { .cnt = g94_sor_cnt, .new = mcp77_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new },
.pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
};
int

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
View File

@ -33,7 +33,7 @@ mcp89_disp = {
.head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
.dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
.sor = { .cnt = g94_sor_cnt, .new = mcp89_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new },
.pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
};
int

15
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
View File

@ -87,10 +87,15 @@ nv50_disp_oneinit_(struct nvkm_disp *base)
}
}
for (i = 0; func->pior.new && i < func->pior.nr; i++) {
ret = func->pior.new(&disp->base, i);
if (ret)
return ret;
if (func->pior.cnt) {
disp->pior.nr = func->pior.cnt(&disp->base, &disp->pior.mask);
nvkm_debug(subdev, " PIOR(s): %d (%02lx)\n",
disp->pior.nr, disp->pior.mask);
for_each_set_bit(i, &disp->pior.mask, disp->pior.nr) {
ret = func->pior.new(&disp->base, i);
if (ret)
return ret;
}
}
disp->sor.nr = func->sor.cnt(&disp->base, &disp->sor.mask);
@ -647,7 +652,7 @@ nv50_disp = {
.head = { .cnt = nv50_head_cnt, .new = nv50_head_new },
.dac = { .cnt = nv50_dac_cnt, .new = nv50_dac_new },
.sor = { .cnt = nv50_sor_cnt, .new = nv50_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new },
.pior = { .cnt = nv50_pior_cnt, .new = nv50_pior_new },
};
int

9
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
View File

@ -27,6 +27,8 @@ struct nv50_disp {
} sor;
struct {
unsigned long mask;
int nr;
u8 type[3];
} pior;
@ -55,12 +57,7 @@ struct nv50_disp_func {
struct {
int (*cnt)(struct nvkm_disp *, unsigned long *mask);
int (*new)(struct nvkm_disp *, int id);
} head, dac, sor;
struct {
int nr;
int (*new)(struct nvkm_disp *, int id);
} pior;
} head, dac, sor, pior;
};
void nv50_disp_intr(struct nv50_disp *);

11
drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
View File

@ -127,8 +127,13 @@ nv50_pior = {
int
nv50_pior_new(struct nvkm_disp *disp, int id)
{
struct nvkm_device *device = disp->engine.subdev.device;
if (!(nvkm_rd32(device, 0x610184) & (0x10000000 << id)))
return 0;
return nvkm_ior_new_(&nv50_pior, disp, PIOR, id);
}
int
nv50_pior_cnt(struct nvkm_disp *disp, unsigned long *pmask)
{
struct nvkm_device *device = disp->engine.subdev.device;
*pmask = (nvkm_rd32(device, 0x610184) & 0x70000000) >> 28;
return 3;
}

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
View File

@ -439,7 +439,7 @@ nv50_disp_root_init(struct nv50_disp_root *root)
}
/* ... PIOR caps */
for (i = 0; i < disp->func->pior.nr; i++) {
for (i = 0; i < disp->pior.nr; i++) {
tmp = nvkm_rd32(device, 0x61e000 + (i * 0x800));
nvkm_wr32(device, 0x6101f0 + (i * 0x04), tmp);
}