From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 Dec 2011 11:21:36 +0000 (+0000)
Subject: drm/Merge branch 'drm-ttm-glisse' of ../drm-radeon-next into drm-core-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=32faa34dc5ed121a1e927753dcbf0ad395d3a956;p=openwrt%2Fstaging%2Fblogic.git

drm/Merge branch 'drm-ttm-glisse' of ../drm-radeon-next into drm-core-next

Merge topic branch containing Jerome's TTM changes, contains one change from
Konrad to swiotlb export.

* 'drm-ttm-glisse' of ../drm-radeon-next:
  drm/ttm: callback move_notify any time bo placement change v4
  drm/ttm: simplify memory accounting for ttm user v2
  drm/ttm: isolate dma data from ttm_tt V4
  drm/nouveau: enable the ttm dma pool when swiotlb is active V3
  drm/radeon/kms: enable the ttm dma pool if swiotlb is on V4
  drm/ttm: provide dma aware ttm page pool code V9
  drm/ttm: introduce callback for ttm_tt populate & unpopulate V4
  drm/ttm: merge ttm_backend and ttm_tt V5
  drm/ttm: page allocation use page array instead of list
  drm/ttm: test for dma_address array allocation failure
  drm/ttm: use ttm put pages function to properly restore cache attribute
  drm/ttm: remove unused backend flags field
  drm/ttm: remove split btw highmen and lowmem page
  drm/ttm: remove userspace backed ttm object support
  swiotlb: Expose swiotlb_nr_tlb function to modules
---

32faa34dc5ed121a1e927753dcbf0ad395d3a956