1. 05 Oct, 2012 14 commits
  2. 04 Oct, 2012 20 commits
  3. 03 Oct, 2012 6 commits
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-next' of... · 268d2837
      Dave Airlie authored
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
      
      This is a major rework of the nouveau driver core, to reflect more closely
      how the hw is used and to make it easier to implement newer features now
      that the GPUs are more clearly understood than when nouveau started.
      
      It also contains a few other bits:
      thermal patches
      nv41/44 pcie gart fixes
      i2c unregistering fixes.
      
      * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (191 commits)
        drm/nv98/crypt: fix fuc build with latest envyas
        drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
        drm/nv41/vm: fix and enable use of "real" pciegart
        drm/nv44/vm: fix and enable use of "real" pciegart
        drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
        drm/nouveau: store supported dma mask in vmmgr
        drm/nvc0/ibus: initial implementation of subdev
        drm/nouveau/therm: add support for fan-control modes
        drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
        drm/nouveau/therm: calculate the pwm divisor on nv50+
        drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
        drm/nouveau/therm: move thermal-related functions to the therm subdev
        drm/nouveau/bios: parse the pwm divisor from the perf table
        drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
        drm/nouveau/therm: rework thermal table parsing
        drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
        drm/nouveau: fix pm initialization order
        drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
        drm/nouveau: log channel debug/error messages from client object rather than drm client
        drm/nouveau: have drm debugging macros build on top of core macros
        ...
      
      Conflicts:
      	drivers/gpu/drm/nouveau/nouveau_dp.c
      268d2837
    • Ben Skeggs's avatar
      b9f10852
    • Ben Skeggs's avatar
      drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering · 7234d023
      Ben Skeggs authored
      Details of the problem, and solution, are in comments in the commit
      proper.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      7234d023
    • Ben Skeggs's avatar
      drm/nv41/vm: fix and enable use of "real" pciegart · 002d0c73
      Ben Skeggs authored
      Hopefully fixed the tlb flush timeout issue.  Was able to observe this
      condition occur occasionally, and it appears the binary driver doesn't
      wait on the old condition either..
      
      Should give 39-bit DMA addressing on the relevant chipsets.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      002d0c73
    • Ben Skeggs's avatar
      drm/nv44/vm: fix and enable use of "real" pciegart · e5f186c4
      Ben Skeggs authored
      Something seems to be missing in regards to flushing specific ranges of
      the TLB.  For the moment, flushing the entire thing seems to make it
      work alright.
      
      Should give 39-bit DMA addressing on the relevant chipsets.
      
      v2: allocate contig 16KiB for dummy pages, reported by mwk on irc
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      e5f186c4
    • Ben Skeggs's avatar
      drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie · 8a57d279
      Ben Skeggs authored
      We don't need to pull the page address out of the page tables on nv4x
      chips that have a real GART.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      8a57d279