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

Browse source

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: radeon constify radeon microcode
  Add i915 ioctls to configure pipes for vblank interrupt.
  drm: update radeon to 1.25 add r200 vertex program support
  drm: radeon add a tcl state flush before accessing tcl vector space

...

This commit is contained in:

Linus Torvalds 2006-06-24 14:48:43 -07:00

parent b464f57946 c499aeb08c

commit abb1cf3cb9

8 changed files with 142 additions and 12 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

4

drivers/char/drm/i915_dma.c

View file

13

drivers/char/drm/i915_drm.h

View file

6

drivers/char/drm/i915_drv.h

View file

69

drivers/char/drm/i915_irq.c

View file

6

drivers/char/drm/radeon_cp.c

View file

7

drivers/char/drm/radeon_drm.h

View file

10

drivers/char/drm/radeon_drv.h

View file

39

drivers/char/drm/radeon_state.c

View file