1. 10 12月, 2012 1 次提交
    • M
      drm/ttm: remove no_wait_reserve, v3 · 97a875cb
      Maarten Lankhorst 提交于
      All items on the lru list are always reservable, so this is a stupid
      thing to keep. Not only that, it is used in a way which would
      guarantee deadlocks if it were ever to be set to block on reserve.
      
      This is a lot of churn, but mostly because of the removal of the
      argument which can be nested arbitrarily deeply in many places.
      
      No change of code in this patch except removal of the no_wait_reserve
      argument, the previous patch removed the use of no_wait_reserve.
      
      v2:
       - Warn if -EBUSY is returned on reservation, all objects on the list
         should be reservable. Adjusted patch slightly due to conflicts.
      v3:
       - Focus on no_wait_reserve removal only.
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reviewed-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      97a875cb
  2. 03 10月, 2012 3 次提交
    • B
      drm/nve0: use async copy engine for ttm buffer moves if available · 49981046
      Ben Skeggs 提交于
      Kepler PFIFO lost the ability to address multiple engines from a single
      channel, so we need a separate one for the copy engine.
      
      v2: Marcin Slusarz <marcin.slusarz@gmail.com>
      - regression fix: restore hw accelerated buffer copies
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      49981046
    • B
      drm/nouveau: port all engines to new engine module format · ebb945a9
      Ben Skeggs 提交于
      This is a HUGE commit, but it's not nearly as bad as it looks - any problems
      can be isolated to a particular chipset and engine combination.  It was
      simply too difficult to port each one at a time, the compat layers are
      *already* ridiculous.
      
      Most of the changes here are simply to the glue, the process for each of the
      engine modules was to start with a standard skeleton and copy+paste the old
      code into the appropriate places, fixing up variable names etc as needed.
      
      v2: Marcin Slusarz <marcin.slusarz@gmail.com>
      - fix find/replace bug in license header
      
      v3: Ben Skeggs <bskeggs@redhat.com>
      - bump indirect pushbuf size to 8KiB, 4KiB barely enough for userspace and
        left no space for kernel's requirements during GEM pushbuf submission.
      - fix duplicate assignments noticed by clang
      
      v4: Marcin Slusarz <marcin.slusarz@gmail.com>
      - add sparse annotations to nv04_fifo_pause/nv04_fifo_start
      - use ioread32_native/iowrite32_native for fifo control registers
      
      v5: Ben Skeggs <bskeggs@redhat.com>
      - rebase on v3.6-rc4, modified to keep copy engine fix intact
      - nv10/fence: unmap fence bo before destroying
      - fixed fermi regression when using nvidia gr fuc
      - fixed typo in supported dma_mask checking
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      ebb945a9
    • B
      8be21a64