• Dave Airlie's avatar
    Merge branch 'drm-ttm-unmappable' into drm-core-next · 7547a917
    Dave Airlie authored
    * 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
    7547a917
r100.c 99.6 KB