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
2012-01-09 14:28:38 -08:00
2011-12-13 15:31:27 -05:00
2011-12-01 13:09:31 -05:00
2011-11-11 09:50:19 -08:00
2011-11-03 09:40:51 -07:00
2011-12-30 15:25:52 -08:00
2011-12-11 18:25:16 -05:00
2012-01-10 10:20:34 -08:00
2011-12-19 14:57:07 -05:00
2011-12-10 16:18:35 -05:00
2011-11-07 09:11:16 -08:00
2012-01-09 13:08:28 -08:00
2011-12-27 20:31:38 +01:00
2012-01-03 09:10:09 +01:00
2012-01-09 14:21:03 -08:00
2011-12-23 10:17:51 +11:00
2012-01-03 20:20:01 +00:00
2011-11-17 12:15:39 -08:00
2011-12-13 15:30:49 -05:00
2012-01-08 12:19:57 -08:00
2012-01-04 15:52:42 -08:00
2011-10-31 19:32:32 -04:00
2012-01-08 19:14:59 -05:00
2011-11-02 16:07:03 -07:00
2011-12-13 18:46:56 -05:00
2011-11-26 16:40:30 -05:00
2011-10-26 15:43:26 -04:00
2011-10-26 15:43:25 -04:00
2012-01-03 22:55:17 -05:00
2011-10-31 00:33:36 +08:00
2011-11-16 09:21:50 +01:00
2011-12-06 08:33:54 +01:00
2011-10-24 16:11:30 +02:00
2011-11-23 10:59:13 +01:00
2011-10-31 17:30:54 -07:00
2011-10-17 19:22:46 -04:00
2011-10-20 18:21:36 -04:00
2011-11-22 15:22:23 -05:00
2012-01-09 12:59:24 -08:00
2011-12-28 21:25:35 +08:00
2011-10-13 14:36:58 +01:00
2011-10-03 09:34:16 +02:00
2011-12-19 11:41:40 +01:00
2011-10-31 17:30:49 -07:00
2012-01-03 22:55:19 -05:00
2012-01-03 22:54:57 -05:00
2011-10-29 21:20:22 +02:00
2012-01-07 12:03:30 -08:00
2011-12-08 13:57:20 +11:00
2011-10-30 15:16:41 +01:00
2011-11-06 19:44:47 -08:00
2011-10-21 14:24:07 +02:00
2012-01-09 19:23:45 -05:00
2012-01-08 12:19:57 -08:00
2011-11-23 18:49:22 +01:00
2011-11-07 23:54:53 +01:00
2011-10-31 19:32:26 -04:00
2011-10-31 20:19:04 +00:00
2012-01-08 12:19:57 -08:00
2011-10-31 20:19:04 +00:00
2011-10-31 20:18:58 +00:00
2011-10-31 20:21:24 +00:00
2011-12-16 08:49:57 -08:00
2012-01-06 10:20:21 +00:00
2011-11-06 17:12:03 -08:00
2011-11-06 19:44:47 -08:00
2011-10-31 17:30:44 -07:00
2011-10-04 13:08:18 -07:00
2011-10-31 17:30:54 -07:00
2011-11-29 12:46:19 -05:00
2011-12-14 15:21:07 -08:00
2011-11-26 14:59:39 -05:00
2011-10-19 14:33:08 +02:00
2011-10-30 15:16:43 +01:00
2011-12-11 18:25:16 -05:00
2012-01-04 14:10:28 -05:00
2011-10-31 09:20:11 -04:00
2011-10-10 18:25:59 +02:00
2012-01-03 22:54:58 -05:00
2011-10-19 19:35:51 -04:00
2011-10-31 19:32:32 -04:00
2011-12-27 01:06:33 +01:00
2012-01-06 23:20:13 -05:00
2011-10-31 17:30:54 -07:00
2011-10-05 01:10:12 +00:00
2011-12-05 13:28:45 -05:00
2011-10-31 19:32:32 -04:00
2011-11-06 19:44:47 -08:00
2011-12-03 09:35:08 -08:00
2012-01-03 22:54:55 -05:00
2011-11-15 19:08:27 +08:00
2011-10-24 16:04:06 +02:00
2011-12-11 10:31:24 -08:00
2012-01-09 11:24:59 +01:00
2011-10-31 17:30:48 -07:00
2011-11-19 06:15:59 -05:00
2011-11-08 09:28:27 +02:00
2012-01-04 16:13:05 -08:00
2011-10-29 09:37:09 +01:00
2012-01-06 11:42:52 -08:00
2012-01-03 22:54:56 -05:00
2011-12-13 15:30:40 -05:00
2011-12-05 18:27:56 -05:00
2011-10-16 13:15:38 -07:00
2011-10-21 02:53:07 -04:00
2011-10-03 14:03:48 -04:00
2011-11-16 18:16:38 -05:00
2011-12-08 19:52:42 -05:00
2011-11-13 16:10:10 -05:00
2011-12-30 16:42:19 -05:00
2012-01-09 12:59:24 -08:00
2011-10-28 14:25:01 -07:00
2011-10-26 16:17:32 +02:00
2011-10-17 11:42:49 +02:00
2011-10-28 05:54:23 -07:00
2011-10-21 14:38:55 +02:00
2012-01-03 22:55:17 -05:00
2011-10-31 19:32:32 -04:00
2011-10-31 19:32:32 -04:00
2011-12-11 18:25:16 -05:00
2011-10-04 12:43:49 +02:00
2011-10-31 19:32:35 -04:00
2011-10-31 19:32:35 -04:00
2011-12-23 22:33:58 +00:00
2012-01-03 22:54:55 -05:00
2011-10-27 04:38:18 -04:00
2011-10-27 04:38:18 -04:00
2012-01-09 13:52:09 +01:00
2011-12-06 20:41:03 +01:00
2011-10-31 17:30:54 -07:00
2011-12-30 16:42:19 -05:00
2011-10-31 17:30:54 -07:00
2011-12-06 09:06:38 +01:00
2011-11-07 07:54:42 +10:30
2011-10-31 17:46:07 -07:00
2011-12-09 23:36:36 +01:00
2011-12-21 15:13:54 -08:00
2011-12-14 11:19:07 -08:00
2011-11-21 12:32:23 -08:00
2011-12-27 11:24:29 +02:00
2011-12-27 11:26:41 +02:00
2011-12-26 13:27:44 +02:00
2011-11-17 12:20:19 +01:00
2011-12-22 02:02:20 -05:00
2011-10-31 17:30:54 -07:00
2011-10-31 17:30:52 -07:00
2011-10-31 17:30:57 -07:00
2011-11-14 13:35:16 +01:00
2011-12-12 22:06:55 -08:00
2011-11-04 17:22:14 -07:00
2011-11-02 16:06:59 -07:00
2011-12-13 18:46:55 -05:00
2011-11-15 16:56:17 -05:00
2011-11-15 16:56:17 -05:00
2011-12-08 10:22:09 -08:00
2012-01-09 13:44:23 -08:00
2011-12-21 14:48:43 -08:00
2011-11-21 15:27:19 -05:00
2012-01-03 22:55:15 -05:00
2011-11-02 16:06:57 -07:00
2011-12-20 12:14:26 +01:00
2011-10-31 17:30:54 -07:00
2011-12-08 10:22:09 -08:00
2012-01-03 22:57:13 -05:00
2011-11-22 10:58:30 +00:00
2011-10-31 09:20:11 -04:00
2011-10-31 09:20:11 -04:00
2012-01-03 22:57:12 -05:00
2011-11-02 12:53:42 +01:00
2011-11-14 00:47:54 -05:00
2011-10-19 17:00:35 -04:00
2011-11-16 17:43:12 -05:00
2012-01-09 14:46:52 -08:00
2011-11-21 16:38:08 -05:00
2011-12-06 13:57:36 -05:00
2012-01-04 14:30:43 -05:00
2011-10-19 11:52:12 -04:00
2012-01-03 22:52:34 -05:00
2011-10-19 13:58:38 -07:00
2011-11-04 16:39:04 -04:00
2011-12-19 14:34:13 -05:00
2011-11-18 10:51:01 -08:00
2011-12-21 14:48:43 -08:00
2011-12-27 10:57:13 -06:00
2011-12-12 13:40:16 -07:00
2011-10-31 14:03:22 +01:00
2011-10-31 19:32:27 -04:00
2012-01-07 12:18:52 -08:00
2011-10-31 17:30:45 -07:00
2011-12-03 09:35:17 -08:00
2011-11-04 22:28:13 +01:00
2011-10-31 19:32:32 -04:00
2011-12-05 18:13:11 +01:00
2011-10-14 09:05:35 -07:00
2011-10-31 10:23:57 -07:00
2011-10-31 10:23:57 -07:00
2011-12-22 10:40:20 -08:00
2011-12-21 10:26:37 +01:00
2011-11-18 14:37:40 -05:00
2011-10-24 02:54:50 -04:00
2012-01-05 14:01:21 -05:00
2012-01-08 13:10:57 -08:00
2011-12-09 23:22:41 +01:00
2011-12-25 23:43:11 +01:00
2011-12-01 21:46:42 +01:00
2011-12-25 23:43:05 +01:00
2011-12-08 10:22:07 -08:00
2011-11-02 16:07:02 -07:00
2011-10-31 17:30:54 -07:00
2012-01-03 22:54:56 -05:00
2011-11-17 13:13:29 -08:00
2011-10-31 17:30:54 -07:00
2012-01-03 22:55:07 -05:00
2011-10-28 05:29:07 -07:00
2011-12-11 10:32:06 -08:00
2011-12-05 16:21:05 +00:00
2012-01-06 23:20:13 -05:00
2012-01-06 23:20:13 -05:00
2012-01-03 22:54:56 -05:00
2011-10-03 15:19:19 -04:00
2011-11-02 16:07:01 -07:00
2012-01-09 12:59:24 -08:00
2012-01-08 13:21:22 -08:00
2011-11-02 16:07:01 -07:00
2012-01-03 22:52:40 -05:00
2011-12-09 19:14:13 -08:00
2011-11-26 20:11:20 -08:00
2011-11-11 16:16:25 +09:00
2011-11-15 12:13:44 -08:00
2011-10-31 19:32:32 -04:00
2011-11-11 16:11:41 +09:00
2011-12-25 23:39:11 +01:00
2011-11-11 16:45:35 +09:00
2012-01-03 22:55:07 -05:00
2011-12-09 07:50:27 -08:00
2011-11-29 11:59:50 +00:00
2012-01-05 14:01:21 -05:00
2012-01-09 14:19:33 -08:00
2012-01-03 20:23:18 -05:00
2011-12-30 16:42:19 -05:00
2011-12-11 10:32:06 -08:00
2011-10-31 19:32:28 -04:00
2011-10-31 17:30:47 -07:00
2011-12-08 23:22:21 +01:00
2011-10-31 17:30:44 -07:00
2011-12-06 10:38:03 +00:00
2012-01-03 22:55:19 -05:00
2012-01-03 22:55:12 -05:00
2011-10-31 19:32:24 -04:00
2012-01-03 22:54:56 -05:00
2011-12-21 01:03:23 -05:00
2011-10-31 19:32:32 -04:00
2011-12-11 10:31:57 -08:00
2011-10-31 17:30:54 -07:00
2011-10-26 15:11:09 +02:00
2012-01-08 13:21:22 -08:00
2012-01-04 22:19:55 -08:00
2011-10-12 21:13:11 -07:00
2011-10-31 19:32:32 -04:00
2011-12-30 16:46:02 -05:00
2012-01-09 12:09:47 -08:00
2011-11-02 16:07:02 -07:00
2011-10-31 19:32:31 -04:00
2011-10-31 19:32:23 -04:00
2011-11-03 18:29:09 -02:00
2011-12-02 13:49:21 -05:00
2011-11-24 13:04:47 +10:30
2011-11-02 11:40:59 +10:30
2011-11-02 11:40:59 +10:30
2011-10-31 19:32:32 -04:00
2011-12-05 23:27:59 +00:00
2011-12-21 10:07:39 +01:00
2011-12-02 14:57:31 +01:00
2012-01-06 15:22:04 +01:00
2011-10-11 16:01:09 +03:00
2011-10-31 00:33:36 +08:00
1a464cbb3d