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

drm/nouveau/therm: skip probing for devices not specified in thermal tables 

Saves some time during driver load, as described by the relevant section[1]
of the DCB 4.x specification.

[1] https://nvidia.github.io/open-gpu-doc/DCB/DCB-4.x-Specification.html#_i2c_device_table

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2019-07-02 12:52:11 +10:00
parent edc641b2b2
commit f0790cda65
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,4 +26,6 @@ nvbios_extdev_parse(struct nvkm_bios *, int, struct nvbios_extdev_func *);
int int
nvbios_extdev_find(struct nvkm_bios *, enum nvbios_extdev_type, nvbios_extdev_find(struct nvkm_bios *, enum nvbios_extdev_type,
struct nvbios_extdev_func *); struct nvbios_extdev_func *);
bool nvbios_extdev_skip_probe(struct nvkm_bios *);
#endif #endif

13
drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c
View File

@ -46,6 +46,19 @@ extdev_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *len, u8 *cnt)
return extdev + *hdr; return extdev + *hdr;
} }
bool
nvbios_extdev_skip_probe(struct nvkm_bios *bios)
{
u8 ver, hdr, len, cnt;
u16 data = extdev_table(bios, &ver, &hdr, &len, &cnt);
if (data && ver == 0x40 && hdr >= 5) {
u8 flags = nvbios_rd08(bios, data - hdr + 4);
if (flags & 1)
return true;
}
return false;
}
static u16 static u16
nvbios_extdev_entry(struct nvkm_bios *bios, int idx, u8 *ver, u8 *len) nvbios_extdev_entry(struct nvkm_bios *bios, int idx, u8 *ver, u8 *len)
{ {

3
drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c
View File

@ -116,6 +116,9 @@ nvkm_therm_ic_ctor(struct nvkm_therm *therm)
return; return;
} }
if (nvbios_extdev_skip_probe(bios))
return;
/* The vbios doesn't provide the address of an exisiting monitoring /* The vbios doesn't provide the address of an exisiting monitoring
device. Let's try our static list. device. Let's try our static list.
*/ */