p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/nouveau/bios/init: add or/link args separate from output path 

As of DCB 4.1, these are not the same thing.

Compatibility temporarily in place until callers have been updated.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-05-19 23:59:34 +10:00
parent ca9c2d5b28
commit b88afa4396
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
View File

@ -7,6 +7,8 @@ struct nvbios_init {
u32 offset;
struct dcb_output *outp;
int or;
int link;
union {
int head;
int crtc;

14
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
View File

@ -87,8 +87,8 @@ static inline int
init_or(struct nvbios_init *init)
{
if (init_exec(init)) {
if (init->outp)
return ffs(init->outp->or) - 1;
if (init->or >= 0)
return init->or;
error("script needs OR!!\n");
}
return 0;
@ -98,8 +98,8 @@ static inline int
init_link(struct nvbios_init *init)
{
if (init_exec(init)) {
if (init->outp)
return !(init->outp->sorconf.link & 1);
if (init->link)
return init->link == 2;
error("script needs OR link\n");
}
return 0;
@ -2277,6 +2277,12 @@ int
nvbios_exec(struct nvbios_init *init)
{
struct nvkm_bios *bios = init->subdev->device->bios;
if (init->bios) {
init->or = init->outp ? ffs(init->outp->or) - 1 : -1;
init->link = init->outp ? init->outp->sorconf.link : 0;
}
init->nested++;
while (init->offset) {
u8 opcode = nvbios_rd08(bios, init->offset);