drm/nouveau/pm: add hooks to get/set *all* clocks at once

This is probably better than having to tell the common code about all the
clocks that exist on every chipset.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 491158d73046..7a88d9cb2ac1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -498,6 +498,11 @@ struct nouveau_pm_engine {
         void *(*clock_pre)(struct drm_device *, struct nouveau_pm_level *,
                            u32 id, int khz);
         void (*clock_set)(struct drm_device *, void *);
+
+        int  (*clocks_get)(struct drm_device *, struct nouveau_pm_level *);
+        void *(*clocks_pre)(struct drm_device *, struct nouveau_pm_level *);
+        void (*clocks_set)(struct drm_device *, void *);
+
         int (*voltage_get)(struct drm_device *);
         int (*voltage_set)(struct drm_device *, int voltage);
         int (*fanspeed_get)(struct drm_device *);
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 179067a1d261..db68531b8114 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -72,6 +72,12 @@ nouveau_pm_perflvl_set(struct drm_device *dev, struct nouveau_pm_level *perflvl)
                 }
         }
 
+        if (pm->clocks_pre) {
+                void *state = pm->clocks_pre(dev, perflvl);
+                if (IS_ERR(state))
+                        return PTR_ERR(state);
+                pm->clocks_set(dev, state);
+        } else
         if (pm->clock_set) {
                 nouveau_pm_clock_set(dev, perflvl, PLL_CORE, perflvl->core);
                 nouveau_pm_clock_set(dev, perflvl, PLL_SHADER, perflvl->shader);
@@ -124,6 +130,11 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)
 
         memset(perflvl, 0, sizeof(*perflvl));
 
+        if (pm->clocks_get) {
+                ret = pm->clocks_get(dev, perflvl);
+                if (ret)
+                        return ret;
+        } else
         if (pm->clock_get) {
                 ret = pm->clock_get(dev, PLL_CORE);
                 if (ret > 0)