Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core-next
* 'nouveau/drm-nouveau-next' of ../drm-nouveau-next: (93 commits) drm/nv50: fix a couple of vm init issues drm/nv04-nv40: Fix up PCI(E) GART DMA object bus address calculation. drm/nouveau: kick vram functions out into an "engine" drm/nouveau: allow gpuobj vinst to be a virtual address when necessary drm/nv50: tidy up PCIEGART implementation drm/nv50: enable non-contig vram allocations where requested drm/nv50: enable 4KiB pages for small vram allocations drm/nv50: implement global channel address space on new VM code drm/nv50: implement BAR1/BAR3 management on top of new VM code drm/nv50: import new vm code drm/nv50: implement custom vram mm drm/nouveau: Avoid potential race between nouveau_fence_update() and context takedown. drm/nouveau: fix use of drm_mm_node in semaphore object drm/nouveau: wrap calls to ttm_bo_validate() drm/nouveau: no need to zero dma objects, we fill them completely anyway drm/nouveau: introduce a util function to wait on reg != val drm/nouveau: implicitly insert non-DMA objects into RAMHT drm/nouveau: make fifo.create_context() responsible for mapping control regs drm/nouveau: Spin for a bit in nouveau_fence_wait() before yielding the CPU. drm/nouveau: Use WC memory on the AGP GART. ...
No related branches found
No related tags found
Showing
- drivers/gpu/drm/nouveau/Makefile 6 additions, 3 deletionsdrivers/gpu/drm/nouveau/Makefile
- drivers/gpu/drm/nouveau/nouveau_bios.c 38 additions, 64 deletionsdrivers/gpu/drm/nouveau/nouveau_bios.c
- drivers/gpu/drm/nouveau/nouveau_bo.c 152 additions, 104 deletionsdrivers/gpu/drm/nouveau/nouveau_bo.c
- drivers/gpu/drm/nouveau/nouveau_channel.c 197 additions, 147 deletionsdrivers/gpu/drm/nouveau/nouveau_channel.c
- drivers/gpu/drm/nouveau/nouveau_connector.c 48 additions, 6 deletionsdrivers/gpu/drm/nouveau/nouveau_connector.c
- drivers/gpu/drm/nouveau/nouveau_display.c 207 additions, 0 deletionsdrivers/gpu/drm/nouveau/nouveau_display.c
- drivers/gpu/drm/nouveau/nouveau_dma.c 2 additions, 8 deletionsdrivers/gpu/drm/nouveau/nouveau_dma.c
- drivers/gpu/drm/nouveau/nouveau_dp.c 3 additions, 3 deletionsdrivers/gpu/drm/nouveau/nouveau_dp.c
- drivers/gpu/drm/nouveau/nouveau_drv.c 23 additions, 29 deletionsdrivers/gpu/drm/nouveau/nouveau_drv.c
- drivers/gpu/drm/nouveau/nouveau_drv.h 280 additions, 138 deletionsdrivers/gpu/drm/nouveau/nouveau_drv.h
- drivers/gpu/drm/nouveau/nouveau_fbcon.c 119 additions, 41 deletionsdrivers/gpu/drm/nouveau/nouveau_fbcon.c
- drivers/gpu/drm/nouveau/nouveau_fbcon.h 6 additions, 6 deletionsdrivers/gpu/drm/nouveau/nouveau_fbcon.h
- drivers/gpu/drm/nouveau/nouveau_fence.c 54 additions, 35 deletionsdrivers/gpu/drm/nouveau/nouveau_fence.c
- drivers/gpu/drm/nouveau/nouveau_gem.c 48 additions, 119 deletionsdrivers/gpu/drm/nouveau/nouveau_gem.c
- drivers/gpu/drm/nouveau/nouveau_hw.c 6 additions, 5 deletionsdrivers/gpu/drm/nouveau/nouveau_hw.c
- drivers/gpu/drm/nouveau/nouveau_irq.c 52 additions, 1158 deletionsdrivers/gpu/drm/nouveau/nouveau_irq.c
- drivers/gpu/drm/nouveau/nouveau_mem.c 197 additions, 222 deletionsdrivers/gpu/drm/nouveau/nouveau_mem.c
- drivers/gpu/drm/nouveau/nouveau_mm.c 271 additions, 0 deletionsdrivers/gpu/drm/nouveau/nouveau_mm.c
- drivers/gpu/drm/nouveau/nouveau_mm.h 62 additions, 0 deletionsdrivers/gpu/drm/nouveau/nouveau_mm.h
- drivers/gpu/drm/nouveau/nouveau_notifier.c 11 additions, 28 deletionsdrivers/gpu/drm/nouveau/nouveau_notifier.c
Loading
Please register or sign in to comment