]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/nouveau/therm: move thermal-related functions to the therm subdev
authorMartin Peres <martin.peres@labri.fr>
Sun, 2 Sep 2012 00:55:58 +0000 (02:55 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 3 Oct 2012 03:13:14 +0000 (13:13 +1000)
commitaa1b9b4836a8ab093ec06b0780553566a5430da7
tree26c305c62178ad4f9bf9644b6b7766cb0af87b1f
parentd46497dce7376e9d3e2e10c59d92e1c3b665b5dd
drm/nouveau/therm: move thermal-related functions to the therm subdev

It looks scary because of the size, but I tried to keep the differences minimal.
Further patches will fix the actual "driver" code and add new features.

v2: change filenames, split to submodules

v3: add a missing include

v4: Ben Skeggs <bskeggs@redhat.com>
- fixed set_defaults() to allow min_duty < 30 (thermal table will
  override this if it's actually necessary)
- fixed set_defaults() to not provide pwm_freq so nv4x (which only has
  pwm_div) can actually work.  the boards using pwm_freq will have a
  thermal table entry to provide us the value.
- removed unused files

Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
22 files changed:
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/core/include/core/device.h
drivers/gpu/drm/nouveau/core/include/subdev/therm.h [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/device/base.c
drivers/gpu/drm/nouveau/core/subdev/device/nv20.c
drivers/gpu/drm/nouveau/core/subdev/device/nv40.c
drivers/gpu/drm/nouveau/core/subdev/device/nv50.c
drivers/gpu/drm/nouveau/core/subdev/device/nvc0.c
drivers/gpu/drm/nouveau/core/subdev/device/nve0.c
drivers/gpu/drm/nouveau/core/subdev/therm/base.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/ic.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/priv.h [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/temp.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nouveau_perf.c
drivers/gpu/drm/nouveau/nouveau_pm.c
drivers/gpu/drm/nouveau/nouveau_pm.h
drivers/gpu/drm/nouveau/nouveau_temp.c [deleted file]
drivers/gpu/drm/nouveau/nv40_pm.c
drivers/gpu/drm/nouveau/nv50_pm.c