diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-09-23 20:58:38 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 16:29:29 +1000 |
| commit | 8155cac489eb8cc6fd96b9bdefacdf5a56e6ea32 (patch) | |
| tree | 0fb54eb113e8cbac73836b9c48989f0bf42d4f2f /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | e829d804d78c57b8e90039079284ac585f72851d (diff) | |
| download | talos-op-linux-8155cac489eb8cc6fd96b9bdefacdf5a56e6ea32.tar.gz talos-op-linux-8155cac489eb8cc6fd96b9bdefacdf5a56e6ea32.zip | |
drm/nouveau: Refactor nouveau_temp_get() into engine pointers.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 3fc5596df360..799cd149745d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -411,6 +411,8 @@ struct nouveau_pm_engine { struct nouveau_pm_level boot; struct nouveau_pm_level *cur; + struct device *hwmon; + int (*clock_get)(struct drm_device *, u32 id); void *(*clock_pre)(struct drm_device *, u32 id, int khz); void (*clock_set)(struct drm_device *, void *); @@ -418,6 +420,7 @@ struct nouveau_pm_engine { int (*voltage_set)(struct drm_device *, int voltage); int (*fanspeed_get)(struct drm_device *); int (*fanspeed_set)(struct drm_device *, int fanspeed); + int (*temp_get)(struct drm_device *); }; struct nouveau_engine { @@ -679,8 +682,6 @@ struct drm_nouveau_private { struct nouveau_fbdev *nfbdev; struct apertures_struct *apertures; - - struct device *int_hwmon_dev; }; static inline struct drm_nouveau_private * |
