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

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>

diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/base.c b/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
index 3ad848bbbbb02af4bff413f78f2993dd16746fa4..508639d0f08859ea16eb536379db7b6b7e0192c2 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
@@ -90,16 +90,20 @@ nouveau_cstate_prog(struct nouveau_clock *clk,
                cstate = &pstate->base;
        }
 
-       ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, +1);
-       if (ret && ret != -ENODEV) {
-               nv_error(clk, "failed to raise fan speed: %d\n", ret);
-               return ret;
+       if (ptherm) {
+               ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, +1);
+               if (ret && ret != -ENODEV) {
+                       nv_error(clk, "failed to raise fan speed: %d\n", ret);
+                       return ret;
+               }
        }
 
-       ret = volt->set_id(volt, cstate->voltage, +1);
-       if (ret && ret != -ENODEV) {
-               nv_error(clk, "failed to raise voltage: %d\n", ret);
-               return ret;
+       if (volt) {
+               ret = volt->set_id(volt, cstate->voltage, +1);
+               if (ret && ret != -ENODEV) {
+                       nv_error(clk, "failed to raise voltage: %d\n", ret);
+                       return ret;
+               }
        }
 
        ret = clk->calc(clk, cstate);
@@ -108,13 +112,17 @@ nouveau_cstate_prog(struct nouveau_clock *clk,
                clk->tidy(clk);
        }
 
-       ret = volt->set_id(volt, cstate->voltage, -1);
-       if (ret && ret != -ENODEV)
-               nv_error(clk, "failed to lower voltage: %d\n", ret);
+       if (volt) {
+               ret = volt->set_id(volt, cstate->voltage, -1);
+               if (ret && ret != -ENODEV)
+                       nv_error(clk, "failed to lower voltage: %d\n", ret);
+       }
 
-       ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, -1);
-       if (ret && ret != -ENODEV)
-               nv_error(clk, "failed to lower fan speed: %d\n", ret);
+       if (ptherm) {
+               ret = nouveau_therm_cstate(ptherm, pstate->fanspeed, -1);
+               if (ret && ret != -ENODEV)
+                       nv_error(clk, "failed to lower fan speed: %d\n", ret);
+       }
 
        return 0;
 }