Linus Torvalds 1a464cbb3d Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (307 commits)
  drm/nouveau/pm: fix build with HWMON off
  gma500: silence gcc warnings in mid_get_vbt_data()
  drm/ttm: fix condition (and vs or)
  drm/radeon: double lock typo in radeon_vm_bo_rmv()
  drm/radeon: use after free in radeon_vm_bo_add()
  drm/sis|via: don't return stack garbage from free_mem ioctl
  drm/radeon/kms: remove pointless CS flags priority struct
  drm/radeon/kms: check if vm is supported in VA ioctl
  drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)
  radeon: Fix disabling PCI bus mastering on big endian hosts.
  ttm: fix agp since ttm tt rework
  agp: Fix multi-line warning message whitespace
  drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don't try to free freed pages.
  drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.
  drm/radeon/kms: sync across multiple rings when doing bo moves v3
  drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)
  drm/radeon: GPU virtual memory support v22
  drm: make DRM_UNLOCKED ioctls with their own mutex
  drm: no need to hold global mutex for static data
  drm/radeon/benchmark: common modes sweep ignores 640x480@32
  ...

Fix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c
2012-01-10 11:04:36 -08:00
..
2011-09-21 13:39:59 -07:00
2005-10-18 08:26:15 -07:00
2011-07-26 16:49:47 -07:00
2008-07-24 10:47:33 -07:00
2011-03-11 14:25:50 +00:00
2008-06-06 11:29:10 -07:00
2011-03-31 11:26:23 -03:00
2007-07-16 09:05:50 -07:00
2011-10-29 21:20:22 +02:00
2007-07-17 10:23:04 -07:00
2006-06-25 10:01:20 -07:00
2011-07-26 16:49:47 -07:00
2005-04-16 15:20:36 -07:00
2006-06-25 10:01:20 -07:00
2007-05-10 18:24:13 +02:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2005-04-16 15:20:36 -07:00
2012-01-03 22:54:56 -05:00
2009-06-18 13:04:05 -07:00
2010-05-25 08:07:06 -07:00
2005-04-16 15:20:36 -07:00
2011-09-20 23:24:44 -04:00
2010-04-06 15:52:11 -07:00
2011-11-02 16:07:00 -07:00
2006-06-20 20:24:58 -07:00
2010-08-09 20:45:05 -07:00
2006-10-06 08:53:40 -07:00
2011-07-25 20:57:15 -07:00
2011-08-06 18:32:45 -07:00
2011-11-04 17:47:34 -04:00
2011-03-31 11:26:23 -03:00
2005-04-16 15:20:36 -07:00
2010-06-16 18:08:13 +02:00
2010-01-11 09:34:05 -08:00
2011-12-08 19:52:43 -05:00
2008-07-26 12:00:10 -07:00
2011-03-31 11:26:23 -03:00
2010-05-19 22:40:47 -04:00