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

Browse source

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: fix bo's fence association
  drm/radeon/kms: fix indirect buffer management V2
  drm/edid: Fix interlaced detailed timings to be frame size, not field.
  drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
  drm/radeon/kms: use udelay for short delays
  drm/nouveau: Force TV encoder DPMS reinit after resume.
  drm/nouveau: use mutex for vbios lock

...

This commit is contained in:

Linus Torvalds 2010-02-18 08:10:21 -08:00

parent ab320af224 6b15835282

commit 86404ab60d

13 changed files with 137 additions and 142 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

47

drivers/gpu/drm/drm_edid.c

View file

7

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

2

drivers/gpu/drm/nouveau/nouveau_bios.h

View file

2

drivers/gpu/drm/nouveau/nv17_tv.c

View file

2

drivers/gpu/drm/radeon/atom.c

View file

3

drivers/gpu/drm/radeon/r600_blit_kms.c

View file

9

drivers/gpu/drm/radeon/radeon.h

View file

10

drivers/gpu/drm/radeon/radeon_cs.c

View file

34

drivers/gpu/drm/radeon/radeon_object.c

View file

4

drivers/gpu/drm/radeon/radeon_object.h

View file

105

drivers/gpu/drm/radeon/radeon_ring.c

View file

49

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

3

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

View file