diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-10-26 20:24:12 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 04:01:24 -0500 |
commit | 36f1317ed05f76bfafb442f70575cdaed6da2d8c (patch) | |
tree | 39e750d0ae71281f1fdff8632acf71a4463c5ccd /drivers/gpu/drm/nouveau/nouveau_pm.h | |
parent | f3fbaf34e2b1459eab248c5f0180928e7861120b (diff) |
drm/nv04-nv30/pm: port to newer interfaces
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_pm.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.h b/drivers/gpu/drm/nouveau/nouveau_pm.h index 06df411ca5fe..663088d30428 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.h +++ b/drivers/gpu/drm/nouveau/nouveau_pm.h | |||
@@ -47,10 +47,9 @@ void nouveau_mem_timing_init(struct drm_device *); | |||
47 | void nouveau_mem_timing_fini(struct drm_device *); | 47 | void nouveau_mem_timing_fini(struct drm_device *); |
48 | 48 | ||
49 | /* nv04_pm.c */ | 49 | /* nv04_pm.c */ |
50 | int nv04_pm_clock_get(struct drm_device *, u32 id); | 50 | int nv04_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); |
51 | void *nv04_pm_clock_pre(struct drm_device *, struct nouveau_pm_level *, | 51 | void *nv04_pm_clocks_pre(struct drm_device *, struct nouveau_pm_level *); |
52 | u32 id, int khz); | 52 | int nv04_pm_clocks_set(struct drm_device *, void *); |
53 | void nv04_pm_clock_set(struct drm_device *, void *); | ||
54 | 53 | ||
55 | /* nv40_pm.c */ | 54 | /* nv40_pm.c */ |
56 | int nv40_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); | 55 | int nv40_pm_clocks_get(struct drm_device *, struct nouveau_pm_level *); |