2 diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
3 index 30879df..35699a0 100644
4 --- a/drivers/gpu/Makefile
5 +++ b/drivers/gpu/Makefile
7 -obj-y += drm/ vga/ stub/
8 +obj-y += drm/ vga/ stub/ misc/
9 diff --git a/drivers/gpu/misc/Kconfig b/drivers/gpu/misc/Kconfig
11 index 0000000..50043d3
13 +++ b/drivers/gpu/misc/Kconfig
16 + tristate "Virtio userspace memory transport"
17 + depends on VIRTIO_PCI
20 + A Driver to facilitate transferring data from userspace to a
21 + hypervisor (eg. qemu)
23 diff --git a/drivers/gpu/misc/Makefile b/drivers/gpu/misc/Makefile
25 index 0000000..d9ab333
27 +++ b/drivers/gpu/misc/Makefile
29 +obj-$(CONFIG_VIRTIOGL) += virtio-gl.o
30 diff --git a/drivers/gpu/misc/virtio-gl.c b/drivers/gpu/misc/virtio-gl.c
32 index 0000000..8882bda
34 +++ b/drivers/gpu/misc/virtio-gl.c
37 + * Copyright (C) 2010 Intel Corporation
39 + * Author: Ian Molton <ian.molton@collabora.co.uk>
41 + * This program is free software; you can redistribute it and/or modify
42 + * it under the terms of the GNU General Public License as published by
43 + * the Free Software Foundation; either version 2 of the License, or
44 + * (at your option) any later version.
46 + * This program is distributed in the hope that it will be useful,
47 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
48 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
49 + * GNU General Public License for more details.
51 + * You should have received a copy of the GNU General Public License
52 + * along with this program; if not, write to the Free Software
53 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
56 +#include <linux/kernel.h>
57 +#include <linux/module.h>
58 +#include <linux/fs.h>
59 +#include <linux/dma-mapping.h>
60 +#include <linux/sched.h>
61 +#include <linux/slab.h>
62 +#include <linux/miscdevice.h>
63 +#include <linux/virtio.h>
64 +#include <linux/virtio_ids.h>
65 +#include <linux/virtio_config.h>
67 +#define DEVICE_NAME "glmem"
69 +/* Define to use debugging checksums on transfers */
72 +struct virtio_gl_data {
78 +struct virtio_gl_header {
88 +#define to_virtio_gl_data(a) ((struct virtio_gl_data *)(a)->private_data)
91 +#define SIZE_OUT_HEADER (sizeof(int)*4)
92 +#define SIZE_IN_HEADER (sizeof(int)*2)
94 +#define SIZE_OUT_HEADER (sizeof(int)*3)
95 +#define SIZE_IN_HEADER sizeof(int)
98 +static struct virtqueue *vq;
101 +/* This is videobuf_vmalloc_to_sg() from videobuf-dma-sg.c with
102 + * some modifications
104 +static struct scatterlist *vmalloc_to_sg(struct scatterlist *sg_list,
105 + unsigned char *virt, unsigned int pages)
110 + BUG_ON((ulong)virt & ~PAGE_MASK);
112 + /* Fill with elements for the data */
114 + pg = vmalloc_to_page(virt);
118 + sg_set_page(sg_list, pg, PAGE_SIZE, 0);
131 +static int put_data(struct virtio_gl_data *gldata)
133 + struct scatterlist *sg, *sg_list;
134 + unsigned int count, ret, o_page, i_page, sg_entries;
135 + struct virtio_gl_header *header =
136 + (struct virtio_gl_header *)gldata->buffer;
138 + ret = header->buf_size;
140 + o_page = (header->buf_size + PAGE_SIZE-1) >> PAGE_SHIFT;
141 + i_page = (header->r_buf_size + PAGE_SIZE-1) >> PAGE_SHIFT;
143 + header->pid = gldata->pid;
145 + if ((o_page && i_page) &&
146 + (o_page > gldata->pages || i_page > gldata->pages)) {
150 + if (o_page > gldata->pages)
151 + o_page = gldata->pages;
153 + if (i_page > gldata->pages)
154 + i_page = gldata->pages;
159 + sg_entries = o_page + i_page;
161 + sg_list = kcalloc(sg_entries, sizeof(struct scatterlist), GFP_KERNEL);
168 + sg_init_table(sg_list, sg_entries);
170 + sg = vmalloc_to_sg(sg_list, gldata->buffer, o_page);
171 + sg = vmalloc_to_sg(sg, gldata->buffer, i_page);
178 + /* Transfer data */
179 + if (virtqueue_add_buf(vq, sg_list, o_page, i_page, (void *)1, GFP_ATOMIC) >= 0) {
180 + virtqueue_kick(vq);
181 + /* Chill out until it's done with the buffer. */
182 + while (!virtqueue_get_buf(vq, &count))
192 +static void free_buffer(struct virtio_gl_data *gldata)
194 + if (gldata->buffer) {
195 + vfree(gldata->buffer);
196 + gldata->buffer = NULL;
200 +static int glmem_open(struct inode *inode, struct file *file)
202 + struct virtio_gl_data *gldata = kzalloc(sizeof(struct virtio_gl_data),
208 + gldata->pid = pid_nr(task_pid(current));
210 + file->private_data = gldata;
215 +static int glmem_mmap(struct file *filp, struct vm_area_struct *vma)
217 + struct virtio_gl_data *gldata = to_virtio_gl_data(filp);
218 + int pages = (vma->vm_end - vma->vm_start) / PAGE_SIZE;
220 + /* Set a reasonable limit */
224 + /* for now, just allow one buffer to be mmap()ed. */
225 + if (gldata->buffer)
228 + gldata->buffer = vmalloc_user(pages*PAGE_SIZE);
230 + if (!gldata->buffer)
233 + gldata->pages = pages;
235 + if (remap_vmalloc_range(vma, gldata->buffer, 0) < 0) {
236 + vfree(gldata->buffer);
240 + vma->vm_flags |= VM_DONTEXPAND;
245 +static int glmem_fsync(struct file *filp, int datasync)
247 + struct virtio_gl_data *gldata = to_virtio_gl_data(filp);
254 +static int glmem_release(struct inode *inode, struct file *file)
256 + struct virtio_gl_data *gldata = to_virtio_gl_data(file);
258 + if (gldata && gldata->buffer) {
259 + struct virtio_gl_header *header =
260 + (struct virtio_gl_header *)gldata->buffer;
262 + /* Make sure the host hears about the process ending / dying */
263 + header->pid = gldata->pid;
264 + header->buf_size = SIZE_OUT_HEADER + 2;
265 + header->r_buf_size = SIZE_IN_HEADER;
266 + *(short *)(&header->buffer) = -1;
269 + free_buffer(gldata);
277 +static const struct file_operations glmem_fops = {
278 + .owner = THIS_MODULE,
279 + .open = glmem_open,
280 + .mmap = glmem_mmap,
281 + .fsync = glmem_fsync,
282 + .release = glmem_release,
285 +static struct miscdevice glmem_dev = {
286 + MISC_DYNAMIC_MINOR,
291 +static int glmem_probe(struct virtio_device *vdev)
295 + /* We expect a single virtqueue. */
296 + vq = virtio_find_single_vq(vdev, NULL, "output");
298 + return PTR_ERR(vq);
300 + ret = misc_register(&glmem_dev);
302 + printk(KERN_ERR "glmem: cannot register glmem_dev as misc");
309 +static void __devexit glmem_remove(struct virtio_device *vdev)
311 + vdev->config->reset(vdev);
312 + misc_deregister(&glmem_dev);
313 + vdev->config->del_vqs(vdev);
316 +static struct virtio_device_id id_table[] = {
317 + { VIRTIO_ID_GL, VIRTIO_DEV_ANY_ID },
321 +static struct virtio_driver virtio_gl_driver = {
323 + .name = KBUILD_MODNAME,
324 + .owner = THIS_MODULE,
326 + .id_table = id_table,
327 + .probe = glmem_probe,
328 + .remove = __devexit_p(glmem_remove),
331 +static int __init glmem_init(void)
333 + return register_virtio_driver(&virtio_gl_driver);
336 +static void __exit glmem_exit(void)
338 + unregister_virtio_driver(&virtio_gl_driver);
341 +module_init(glmem_init);
342 +module_exit(glmem_exit);
344 +MODULE_DEVICE_TABLE(virtio, id_table);
345 +MODULE_DESCRIPTION("Virtio gl passthrough driver");
346 +MODULE_LICENSE("GPL v2");
348 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
349 index 3d94a14..9a9a6cc 100644
350 --- a/drivers/video/Kconfig
351 +++ b/drivers/video/Kconfig
352 @@ -16,6 +16,7 @@ source "drivers/char/agp/Kconfig"
353 source "drivers/gpu/vga/Kconfig"
355 source "drivers/gpu/drm/Kconfig"
356 +source "drivers/gpu/misc/Kconfig"
360 --- linux-3.4/include/uapi/linux/virtio_ids.h~ 2012-05-21 08:42:02.000000000 +0200
361 +++ linux-3.4/include/uapi/linux/virtio_ids.h 2012-05-21 09:02:40.065957644 +0200
363 #define VIRTIO_ID_CONSOLE 3 /* virtio console */
364 #define VIRTIO_ID_RNG 4 /* virtio ring */
365 #define VIRTIO_ID_BALLOON 5 /* virtio balloon */
366 +#define VIRTIO_ID_GL 6 /* virtio usermem */
367 #define VIRTIO_ID_RPMSG 7 /* virtio remote processor messaging */
368 #define VIRTIO_ID_SCSI 8 /* virtio scsi */
369 #define VIRTIO_ID_9P 9 /* 9p virtio console */