Linus Torvalds 9fdadb2cba
Merge branch 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux ...
Pull drm prime mmap/vmap code from Dave Airlie:
"As mentioned previously these are the extra bits of drm that relied on
the dma-buf pull to work, the first three just stub out the mmap
interface, and the next set provide vmap export to i915/radeon/nouveau
and vmap import to udl."
* 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux:
radeon: add radeon prime vmap support.
nouveau: add vmap support to nouveau prime support
udl: support vmapping imported dma-bufs
i915: add dma-buf vmap support for exporting vmapped buffer
radeon: add stub dma-buf mmap functionality
nouveau: add stub dma-buf mmap functionality.
i915: add stub dma-buf mmap callback.
2012-05-31 18:01:18 -07:00
2012-05-30 10:12:48 -07:00
2012-05-26 12:22:27 -07:00
2012-05-26 12:42:29 -07:00
2012-05-24 16:22:53 -04:00
2012-05-30 10:55:34 +02:00
2012-05-24 11:54:29 -07:00
2012-05-31 08:46:50 +02:00
2012-05-24 11:54:29 -07:00
2012-05-24 12:42:54 -07:00
2012-05-26 13:05:55 -07:00
2012-05-02 00:39:43 +02:00
2012-05-02 00:25:13 +02:00
2012-05-08 12:35:06 +02:00
2012-05-26 12:42:29 -07:00
2012-05-23 14:07:06 -07:00
2012-05-26 12:57:47 -07:00
2012-05-30 12:11:32 -07:00
2012-05-22 16:02:13 -07:00
2012-05-24 12:57:47 -07:00
2012-05-03 17:19:19 -07:00
2012-05-29 18:27:19 -07:00
2012-05-31 14:14:01 +01:00
2012-05-22 19:22:50 -07:00
2012-04-23 14:23:32 +03:00
2012-05-22 16:02:13 -07:00
2012-05-30 07:56:20 +02:00
2012-05-30 10:55:34 +02:00
2012-05-16 15:17:08 -04:00
2012-05-14 13:37:45 -07:00
2012-05-21 17:54:55 -07:00
2012-05-30 10:55:34 +02:00
2012-05-30 08:49:28 -07:00
2012-05-24 11:54:29 -07:00
2012-05-29 16:22:32 -07:00
2012-05-09 10:58:21 +10:00
2012-05-23 17:08:40 -07:00
2012-05-26 12:42:29 -07:00
2012-05-14 12:52:52 -07:00
2012-05-31 12:02:41 -07:00
2012-05-29 11:53:11 -07:00
2012-05-29 11:53:11 -07:00
2012-05-26 12:57:47 -07:00
2012-05-29 18:27:19 -07:00
2012-05-31 10:32:36 -07:00
2012-05-25 11:16:16 -04:00
2012-05-29 18:27:19 -07:00
2012-05-22 19:22:50 -07:00
2012-05-22 16:02:13 -07:00
2012-05-29 18:27:19 -07:00
2012-05-07 09:56:39 +08:00
2012-05-26 13:05:55 -07:00
2012-05-29 16:22:30 -07:00
2012-05-31 12:10:15 -07:00
2012-04-24 18:18:01 -07:00
2012-05-22 19:22:50 -07:00
2012-05-29 11:53:11 -07:00
2012-05-30 08:49:28 -07:00
2012-05-29 16:22:34 -07:00
2012-05-31 10:51:10 -07:00
2012-05-31 12:02:41 -07:00
2012-05-22 19:07:55 +09:00
2012-05-26 13:05:55 -07:00
2012-05-16 12:46:37 -04:00
2012-05-29 16:22:22 -07:00
2012-05-23 16:52:27 -07:00
2012-05-31 11:59:41 -07:00
2012-05-15 08:44:58 -07:00
2012-05-26 12:42:29 -07:00
2012-04-18 13:15:51 -07:00
2012-05-16 22:17:37 -04:00
2012-05-30 10:55:34 +02:00
2012-05-22 12:16:15 +09:30
2012-05-08 16:01:34 -07:00
2012-05-26 12:42:29 -07:00
2012-05-30 08:16:48 +02:00
2012-05-29 20:14:53 -07:00
2012-05-22 16:34:21 -07:00
2012-05-26 12:22:27 -07:00
9fdadb2cba