Merge branch 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux into drm-core-next

Browse source

* 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux:
  drm/radeon: add PRIME support (v2)
  i915: add dmabuf/prime buffer sharing support.
  nouveau: add PRIME support
  ttm: add prime sharing support to TTM (v2)
  udl: add prime fd->handle support.
  drm/prime: add exported buffers to current fprivs imported buffer list (v2)
  drm/prime: introduce sg->pages/addr arrays helper

...

This commit is contained in:

Dave Airlie 2012-05-23 10:46:24 +01:00

parent 4d93914ae3 40f5cf9969

commit 5b2ba70091

50 changed files with 950 additions and 67 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

drivers/gpu/drm/drm_gem.c

View file

48

drivers/gpu/drm/drm_prime.c

View file

3

drivers/gpu/drm/i915/Makefile

View file

8

drivers/gpu/drm/i915/i915_drv.c

View file

11

drivers/gpu/drm/i915/i915_drv.h

View file

37

drivers/gpu/drm/i915/i915_gem.c

View file

171

drivers/gpu/drm/i915/i915_gem_dmabuf.c

View file

15

drivers/gpu/drm/i915/i915_gem_gtt.c

View file

2

drivers/gpu/drm/nouveau/Makefile

View file

42

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

2

drivers/gpu/drm/nouveau/nouveau_channel.c

View file

8

drivers/gpu/drm/nouveau/nouveau_drv.c

View file

10

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

2

drivers/gpu/drm/nouveau/nouveau_fence.c

View file

6

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

2

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

163

drivers/gpu/drm/nouveau/nouveau_prime.c

View file

5

drivers/gpu/drm/nouveau/nouveau_sgdma.c

View file

57

drivers/gpu/drm/nouveau/nouveau_vm.c

View file

6

drivers/gpu/drm/nouveau/nouveau_vm.h

View file

2

drivers/gpu/drm/nouveau/nv04_crtc.c

View file

4

drivers/gpu/drm/nouveau/nv50_crtc.c

View file

4

drivers/gpu/drm/nouveau/nv50_evo.c

View file

6

drivers/gpu/drm/nouveau/nvd0_display.c

View file

2

drivers/gpu/drm/radeon/Makefile

View file

2

drivers/gpu/drm/radeon/evergreen_blit_kms.c

View file

4

drivers/gpu/drm/radeon/r600.c

View file

2

drivers/gpu/drm/radeon/r600_blit_kms.c

View file

4

drivers/gpu/drm/radeon/radeon_benchmark.c

View file

2

drivers/gpu/drm/radeon/radeon_device.c

View file

14

drivers/gpu/drm/radeon/radeon_drv.c

View file

2

drivers/gpu/drm/radeon/radeon_gart.c

View file

4

drivers/gpu/drm/radeon/radeon_gem.c

View file

6

drivers/gpu/drm/radeon/radeon_object.c

View file

7

drivers/gpu/drm/radeon/radeon_object.h

View file

176

drivers/gpu/drm/radeon/radeon_prime.c

View file

4

drivers/gpu/drm/radeon/radeon_ring.c

View file

2

drivers/gpu/drm/radeon/radeon_sa.c

View file

4

drivers/gpu/drm/radeon/radeon_test.c

View file

16

drivers/gpu/drm/radeon/radeon_ttm.c

View file

6

drivers/gpu/drm/radeon/si.c

View file

17

drivers/gpu/drm/ttm/ttm_bo.c

View file

6

drivers/gpu/drm/udl/udl_drv.c

View file

3

drivers/gpu/drm/udl/udl_drv.h

View file

9

drivers/gpu/drm/udl/udl_fb.c

View file

75

drivers/gpu/drm/udl/udl_gem.c

View file

2

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

View file

2

include/drm/drmP.h

View file

9

include/drm/ttm/ttm_bo_api.h

View file

2

include/drm/ttm/ttm_bo_driver.h

View file