drm/nouveau: pass perflvl struct to clock_pre()

On certain boards, there's BIOS scripts and memory timings that need to
be modified with the memclk.  Just pass in the entire perflvl struct and
let the chipset-specific code decide what to do.

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index e1fb2c95eb900c9c950e029cd9d084d2816d0fc6..01ee63a70cc914a0341d713098406c12333f85ed 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -432,7 +432,8 @@ struct nouveau_pm_engine {
        struct device *hwmon;
 
        int (*clock_get)(struct drm_device *, u32 id);
-       void *(*clock_pre)(struct drm_device *, u32 id, int khz);
+       void *(*clock_pre)(struct drm_device *, struct nouveau_pm_level *,
+                          u32 id, int khz);
        void (*clock_set)(struct drm_device *, void *);
        int (*voltage_get)(struct drm_device *);
        int (*voltage_set)(struct drm_device *, int voltage);

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 01437f1753a745c8de03c2dfcadf5abcc71e93b9..1c99c55d6d468a91fb09cda39d5660d3bf712aa5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -31,7 +31,8 @@
 #include <linux/hwmon-sysfs.h>
 
 static int
-nouveau_pm_clock_set(struct drm_device *dev, u8 id, u32 khz)
+nouveau_pm_clock_set(struct drm_device *dev, struct nouveau_pm_level *perflvl,
+                    u8 id, u32 khz)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
@@ -40,7 +41,7 @@ nouveau_pm_clock_set(struct drm_device *dev, u8 id, u32 khz)
        if (khz == 0)
                return 0;
 
-       pre_state = pm->clock_pre(dev, id, khz);
+       pre_state = pm->clock_pre(dev, perflvl, id, khz);
        if (IS_ERR(pre_state))
                return PTR_ERR(pre_state);
 
@@ -67,10 +68,10 @@ nouveau_pm_perflvl_set(struct drm_device *dev, struct nouveau_pm_level *perflvl)
                }
        }
 
-       nouveau_pm_clock_set(dev, PLL_CORE, perflvl->core);
-       nouveau_pm_clock_set(dev, PLL_SHADER, perflvl->shader);
-       nouveau_pm_clock_set(dev, PLL_MEMORY, perflvl->memory);
-       nouveau_pm_clock_set(dev, PLL_UNK05, perflvl->unk05);
+       nouveau_pm_clock_set(dev, perflvl, PLL_CORE, perflvl->core);
+       nouveau_pm_clock_set(dev, perflvl, PLL_SHADER, perflvl->shader);
+       nouveau_pm_clock_set(dev, perflvl, PLL_MEMORY, perflvl->memory);
+       nouveau_pm_clock_set(dev, perflvl, PLL_UNK05, perflvl->unk05);
 
        pm->cur = perflvl;
        return 0;

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.h b/drivers/gpu/drm/nouveau/nouveau_pm.h
index 7504e3b8c023d83e4f089904d8b789c3abc16d82..babe64ac33c05508d32479c87e39a45eb58f4b01 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_pm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.h
@@ -48,12 +48,14 @@ void nouveau_mem_timing_fini(struct drm_device *);
 
 /* nv04_pm.c */
 int nv04_pm_clock_get(struct drm_device *, u32 id);
-void *nv04_pm_clock_pre(struct drm_device *, u32 id, int khz);
+void *nv04_pm_clock_pre(struct drm_device *, struct nouveau_pm_level *,
+                       u32 id, int khz);
 void nv04_pm_clock_set(struct drm_device *, void *);
 
 /* nv50_pm.c */
 int nv50_pm_clock_get(struct drm_device *, u32 id);
-void *nv50_pm_clock_pre(struct drm_device *, u32 id, int khz);
+void *nv50_pm_clock_pre(struct drm_device *, struct nouveau_pm_level *,
+                       u32 id, int khz);
 void nv50_pm_clock_set(struct drm_device *, void *);
 
 /* nouveau_temp.c */

diff --git a/drivers/gpu/drm/nouveau/nv04_pm.c b/drivers/gpu/drm/nouveau/nv04_pm.c
index 61ca92744f93a231b78814b2e16272182c53cc93..6a6eb697d38e0b387941b05b38dadc8a5bd371f1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv04_pm.c
+++ b/drivers/gpu/drm/nouveau/nv04_pm.c
@@ -39,7 +39,8 @@ nv04_pm_clock_get(struct drm_device *dev, u32 id)
 }
 
 void *
-nv04_pm_clock_pre(struct drm_device *dev, u32 id, int khz)
+nv04_pm_clock_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl,
+                 u32 id, int khz)
 {
        struct nv04_pm_state *state;
        int ret;

diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index 64bc29c39c3a39cdb36760d4899feef44e176040..eaf69c83ce9251be363ae62aa4b54352e7f41748 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -67,7 +67,8 @@ nv50_pm_clock_get(struct drm_device *dev, u32 id)
 }
 
 void *
-nv50_pm_clock_pre(struct drm_device *dev, u32 id, int khz)
+nv50_pm_clock_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl,
+                 u32 id, int khz)
 {
        struct nv50_pm_state *state;
        int dummy, ret;