Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

Browse source

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  via invalid device ids removal
  radeon: Commit the ring after each partial texture upload blit.
  i915: fix vbl swap allocation size.
  drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.
  drm: remove XFREE86_VERSION macros.
  drm: Replace filp in ioctl arguments with drm_file *file_priv.
  drm: Remove DRM_ERR OS macro.

...

This commit is contained in:

Linus Torvalds 2007-10-15 08:17:26 -07:00

parent 37ca506adc ace3dff5b7

commit 13626cb91f

56 changed files with 2359 additions and 3116 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

20

drivers/char/drm/drm.h

View file

237

drivers/char/drm/drmP.h

View file

130

drivers/char/drm/drm_agpsupport.c

View file

48

drivers/char/drm/drm_auth.c

View file

203

drivers/char/drm/drm_bufs.c

View file

177

drivers/char/drm/drm_context.c

View file

11

drivers/char/drm/drm_dma.c

View file

67

drivers/char/drm/drm_drawable.c

View file

172

drivers/char/drm/drm_drv.c

View file

34

drivers/char/drm/drm_fops.c

View file

2

drivers/char/drm/drm_ioc32.c

View file

194

drivers/char/drm/drm_ioctl.c

View file

98

drivers/char/drm/drm_irq.c

View file

75

drivers/char/drm/drm_lock.c

View file

10

drivers/char/drm/drm_os_linux.h

View file

2

drivers/char/drm/drm_pciids.h

View file

48

drivers/char/drm/drm_scatter.c

View file

4

drivers/char/drm/drm_vm.c

View file

312

drivers/char/drm/i810_dma.c

View file

5

drivers/char/drm/i810_drm.h

View file

9

drivers/char/drm/i810_drv.h

View file

210

drivers/char/drm/i830_dma.c

View file

15

drivers/char/drm/i830_drv.h

View file

30

drivers/char/drm/i830_irq.c

View file

214

drivers/char/drm/i915_dma.c

View file

36

drivers/char/drm/i915_drv.h

View file

128

drivers/char/drm/i915_irq.c

View file

125

drivers/char/drm/i915_mem.c

View file

140

drivers/char/drm/mga_dma.c

View file

21

drivers/char/drm/mga_drv.h

View file

197

drivers/char/drm/mga_state.c

View file

8

drivers/char/drm/mga_warp.c

View file

138

drivers/char/drm/r128_cce.c

View file

18

drivers/char/drm/r128_drm.h

View file

23

drivers/char/drm/r128_drv.h

View file

351

drivers/char/drm/r128_state.c

View file

68

drivers/char/drm/r300_cmdbuf.c

View file

146

drivers/char/drm/radeon_cp.c

View file

43

drivers/char/drm/radeon_drv.h

View file

34

drivers/char/drm/radeon_irq.c

View file

108

drivers/char/drm/radeon_mem.c

View file

683

drivers/char/drm/radeon_state.c

View file

145

drivers/char/drm/savage_bci.c

View file

9

drivers/char/drm/savage_drv.h

View file

200

drivers/char/drm/savage_state.c

View file

2

drivers/char/drm/sis_drv.c

View file

5

drivers/char/drm/sis_drv.h

View file

112

drivers/char/drm/sis_mm.c

View file

144

drivers/char/drm/via_dma.c

View file

54

drivers/char/drm/via_dmablit.c

View file

22

drivers/char/drm/via_drv.h

View file

47

drivers/char/drm/via_irq.c

View file

14

drivers/char/drm/via_map.c

View file

83

drivers/char/drm/via_mm.c

View file

8

drivers/char/drm/via_verifier.c

View file

20

drivers/char/drm/via_video.c

View file