]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-ttm-unmappable' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 04:15:09 +0000 (14:15 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 04:15:09 +0000 (14:15 +1000)
commit57c5ae4db6ff75bb7db846302143c975e6a40192
tree59b0d0e9b6c251c4df5799b93395454592004d57
parenta8f4e363c8a2ec25e1a4e738913d3a9ede079719
parentd29fa16fc280fff67d02f980fb96426e1e87a7d4
Merge branch 'drm-ttm-unmappable' into drm-core-next

* drm-ttm-unmappable:
  drm/radeon/kms: enable use of unmappable VRAM V2
  drm/ttm: remove io_ field from TTM V6
  drm/vmwgfx: add support for new TTM fault callback V5
  drm/nouveau/kms: add support for new TTM fault callback V5
  drm/radeon/kms: add support for new fault callback V7
  drm/ttm: ttm_fault callback to allow driver to handle bo placement V6
  drm/ttm: split no_wait argument in 2 GPU or reserve wait

Conflicts:
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_gem.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_object.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/radeon/rv770.c
drivers/gpu/drm/ttm/ttm_bo_util.c