1. 14 12月, 2012 10 次提交
  2. 13 12月, 2012 10 次提交
  3. 11 12月, 2012 11 次提交
  4. 10 12月, 2012 7 次提交
    • 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
    • M
      drm/ttm: cope with reserved buffers on lru list in ttm_mem_evict_first, v2 · e7ab2019
      Maarten Lankhorst 提交于
      Replace the goto loop with a simple for each loop, and only run the
      delayed destroy cleanup if we can reserve the buffer first.
      
      No race occurs, since lru lock is never dropped any more. An empty list
      and a list full of unreservable buffers both cause -EBUSY to be returned,
      which is identical to the previous situation, because previously buffers
      on the lru list were always guaranteed to be reservable.
      
      This should work since currently ttm guarantees items on the lru are
      always reservable, and reserving items blockingly with some bo held
      are enough to cause you to run into a deadlock.
      
      Currently this is not a concern since removal off the lru list and
      reservations are always done with atomically, but when this guarantee
      no longer holds, we have to handle this situation or end up with
      possible deadlocks.
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reviewed-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e7ab2019
    • M
      drm/ttm: cope with reserved buffers on swap list in ttm_bo_swapout, v2 · 2b7b3ad2
      Maarten Lankhorst 提交于
      Replace the while loop with a simple for each loop, and only run the
      delayed destroy cleanup if we can reserve the buffer first.
      
      No race occurs, since lru lock is never dropped any more. An empty list
      and a list full of unreservable buffers both cause -EBUSY to be returned,
      which is identical to the previous situation.
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reviewed-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      2b7b3ad2
    • M
      drm/ttm: call ttm_bo_cleanup_refs with reservation and lru lock held, v3 · 85b144f8
      Maarten Lankhorst 提交于
      By removing the unlocking of lru and retaking it immediately, a race is
      removed where the bo is taken off the swap list or the lru list between
      the unlock and relock. As such the cleanup_refs code can be simplified,
      it will attempt to call ttm_bo_wait non-blockingly, and if it fails
      it will drop the locks and perform a blocking wait, or return an error
      if no_wait_gpu was set.
      
      The need for looping is also eliminated, since swapout and evict_mem_first
      will always follow the destruction path, no new fence is allowed
      to be attached. As far as I can see this may already have been the case,
      but the unlocking / relocking required a complicated loop to deal with
      re-reservation.
      
      Changes since v1:
       - Simplify no_wait_gpu case by folding it in with empty ddestroy.
       - Hold a reservation while calling ttm_bo_cleanup_memtype_use again.
      Changes since v2:
       - Do not remove bo from lru list while waiting
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reviewed-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      85b144f8
    • M
      drm/radeon: allow move_notify to be called without reservation · 6ed9ccb4
      Maarten Lankhorst 提交于
      The few places that care should have those checks instead.
      This allows destruction of bo backed memory without a reservation.
      It's required for being able to rework the delayed destroy path,
      as it is no longer guaranteed to hold a reservation before unlocking.
      
      However any previous wait is still guaranteed to complete, and it's
      one of the last things to be done before the buffer object is freed.
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      6ed9ccb4
    • M
      drm/ttm: change fence_lock to inner lock · 4154f051
      Maarten Lankhorst 提交于
      This requires changing the order in ttm_bo_cleanup_refs_or_queue to
      take the reservation first, as there is otherwise no race free way to
      take lru lock before fence_lock.
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reviewed-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      4154f051
    • D
      Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next · 1a1494de
      Dave Airlie 提交于
      Alex writes:
      Pretty minor -next pull request.  We some additional new bits waiting
      internally for release.  Hopefully Monday we can get at least some of
      them out.  The others will probably take a few more weeks.
      
      Highlights of the current request:
      - ELD registers for passing audio information to the sound hardware
      - Handle GPUVM page faults more gracefully
      - Misc fixes
      
      Merge radeon test
      * 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux: (483 commits)
        drm/radeon: bump driver version for new info ioctl requests
        drm/radeon: fix eDP clk and lane setup for scaled modes
        drm/radeon: add new INFO ioctl requests
        drm/radeon/dce32+: use fractional fb dividers for high clocks
        drm/radeon: use cached memory when evicting for vram on non agp
        drm/radeon: add a CS flag END_OF_FRAME
        drm/radeon: stop page faults from hanging the system (v2)
        drm/radeon/dce4/5: add registers for ELD handling
        drm/radeon/dce3.2: add registers for ELD handling
        radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
        Linux 3.7-rc7
        powerpc/eeh: Do not invalidate PE properly
        Revert "drm/i915: enable rc6 on ilk again"
        ALSA: hda - Fix build without CONFIG_PM
        of/address: sparc: Declare of_iomap as an extern function for sparc again
        PM / QoS: fix wrong error-checking condition
        bnx2x: remove redundant warning log
        vxlan: fix command usage in its doc
        8139cp: revert "set ring address before enabling receiver"
        MPI: Fix compilation on MIPS with GCC 4.4 and newer
        ...
      
      Conflicts:
      	drivers/gpu/drm/exynos/exynos_drm_encoder.c
      	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
      	drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
      1a1494de
  5. 08 12月, 2012 2 次提交