forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/clk: make therm and volt devices optional

Browse source 
Allow the clock subsystem to operate even if voltage and thermal devices
are not set for the device (for people with watercooling! ;))

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Alexandre Courbot 2014-07-26 18:41:39 +09:00 • committed by Ben Skeggs
commit 2cfd22f473
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/nouveau/core/subdev/clock/base.c
View file

@ -90,17 +90,21 @@ nouveau_cstate_prog(struct nouveau_clock *clk,
cstate = &pstate->base; cstate = &pstate->base;
} }
if (ptherm) {
ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, +1); ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, +1);
if (ret && ret != -ENODEV) { if (ret && ret != -ENODEV) {
nv_error(clk, "failed to raise fan speed: %d\n", ret); nv_error(clk, "failed to raise fan speed: %d\n", ret);
return ret; return ret;
} }
}
if (volt) {
ret = volt->set_id(volt, cstate->voltage, +1); ret = volt->set_id(volt, cstate->voltage, +1);
if (ret && ret != -ENODEV) { if (ret && ret != -ENODEV) {
nv_error(clk, "failed to raise voltage: %d\n", ret); nv_error(clk, "failed to raise voltage: %d\n", ret);
return ret; return ret;
} }
}
ret = clk->calc(clk, cstate); ret = clk->calc(clk, cstate);
if (ret == 0) { if (ret == 0) {
@ -108,13 +112,17 @@ nouveau_cstate_prog(struct nouveau_clock *clk,
clk->tidy(clk); clk->tidy(clk);
} }
if (volt) {
ret = volt->set_id(volt, cstate->voltage, -1); ret = volt->set_id(volt, cstate->voltage, -1);
if (ret && ret != -ENODEV) if (ret && ret != -ENODEV)
nv_error(clk, "failed to lower voltage: %d\n", ret); nv_error(clk, "failed to lower voltage: %d\n", ret);
}
if (ptherm) {
ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, -1); ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, -1);
if (ret && ret != -ENODEV) if (ret && ret != -ENODEV)
nv_error(clk, "failed to lower fan speed: %d\n", ret); nv_error(clk, "failed to lower fan speed: %d\n", ret);
}
return 0; return 0;
} }