diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-10-16 16:33:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-10-16 16:34:11 +1000 |
| commit | 30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b (patch) | |
| tree | 6bf1bcce6448e80549e8b3937a3e45f73fe5e33f /drivers/gpu/drm/nouveau/nouveau_pm.c | |
| parent | 7b8505300525d7e802ecf52ae160bc63f4ba28d7 (diff) | |
| parent | 565f571c48f01a681243a356e9083f5cf24b432e (diff) | |
| download | blackbird-op-linux-30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b.tar.gz blackbird-op-linux-30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b.zip | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
minor set of nouveau fixes.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/bios: fix typo in error message
drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP
drm/nv50/fb: fix double free of vram mm
drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
drm/nouveau/pm: fix a typo related to the move to the therm subdev
drm/nouveau/hwmon: fix the initialization condition
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_pm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 0bf64c90aa20..5566172774df 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -52,7 +52,7 @@ nouveau_pm_perflvl_aux(struct drm_device *dev, struct nouveau_pm_level *perflvl, { struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_pm *pm = nouveau_pm(dev); - struct nouveau_therm *therm = nouveau_therm(drm); + struct nouveau_therm *therm = nouveau_therm(drm->device); int ret; /*XXX: not on all boards, we should control based on temperature @@ -64,7 +64,6 @@ nouveau_pm_perflvl_aux(struct drm_device *dev, struct nouveau_pm_level *perflvl, ret = therm->fan_set(therm, perflvl->fanspeed); if (ret && ret != -ENODEV) { NV_ERROR(drm, "fanspeed set failed: %d\n", ret); - return ret; } } @@ -706,8 +705,7 @@ nouveau_hwmon_init(struct drm_device *dev) struct device *hwmon_dev; int ret = 0; - if (!therm || !therm->temp_get || !therm->attr_get || - !therm->attr_set || therm->temp_get(therm) < 0) + if (!therm || !therm->temp_get || !therm->attr_get || !therm->attr_set) return -ENODEV; hwmon_dev = hwmon_device_register(&dev->pdev->dev); |
