diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-03-20 10:10:18 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-03-20 10:10:18 +0400 |
| commit | cf9a625fae3d0ce8dffab53b2758d7c0cf4a5ad4 (patch) | |
| tree | 69faa745925f0493d5082c675e04d9a985d7f7e7 /include | |
| parent | 10b38669d64c757cfd927e3820292c580ed70aae (diff) | |
| parent | f60b6e7a6078ceae438a95b808be04cd98f9909a (diff) | |
| download | linux-cf9a625fae3d0ce8dffab53b2758d7c0cf4a5ad4.tar.xz | |
Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Lots of thermal fixes and fix a lockdep warning we've been seeing.
* 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50/kms: prevent lockdep false-positive in page flipping path
drm/nouveau/core: fix return value of nouveau_object_del()
drm/nouveau/hwmon: do not expose a buggy temperature if it is unavailable
drm/nouveau/therm: display the availability of the internal sensor
drm/nouveau/therm: disable temperature management if the sensor isn't readable
drm/nouveau/therm: disable auto fan management if temperature is not available
drm/nv40/therm: reserve negative temperatures for errors
drm/nv40/therm: disable temperature reading if the bios misses some parameters
drm/nouveau/therm-ic: the temperature is off by sensor_constant, warn the user
drm/nouveau/therm: remove some confusion introduced by therm_mode
drm/nouveau/therm: do not make assumptions on temperature
drm/nv40/therm: increase the sensor's settling delay to 20ms
drm/nv40/therm: improve selection between the old and the new style
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions