Commit 11a8f280 authored by Dave Airlie's avatar Dave Airlie Committed by Gerd Hoffmann
Browse files

virtio-gpu: add basic prime support 



This is enough to enable DRI3.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 62fb7a5e

drivers/gpu/drm/virtio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ ccflags-y := -Iinclude/drm 
virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_drm_bus.o virtgpu_gem.o \

	virtgpu_fb.o virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \

	virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \

	virtgpu_ioctl.o

	virtgpu_ioctl.o virtgpu_prime.o



obj-$(CONFIG_DRM_VIRTIO_GPU) += virtio-gpu.o

drivers/gpu/drm/virtio/virtgpu_drv.c

+12 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static const struct file_operations virtio_gpu_driver_fops = { 




static struct drm_driver driver = {

	.driver_features = DRIVER_MODESET | DRIVER_GEM,

	.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,

	.set_busid = drm_virtio_set_busid,

	.load = virtio_gpu_driver_load,

	.unload = virtio_gpu_driver_unload,
@@ -133,6 +133,17 @@ static struct drm_driver driver = { 
	.debugfs_init = virtio_gpu_debugfs_init,

	.debugfs_cleanup = virtio_gpu_debugfs_takedown,

#endif

	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export = drm_gem_prime_export,

	.gem_prime_import = drm_gem_prime_import,

	.gem_prime_pin = virtgpu_gem_prime_pin,

	.gem_prime_unpin = virtgpu_gem_prime_unpin,

	.gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table,

	.gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table,

	.gem_prime_vmap = virtgpu_gem_prime_vmap,

	.gem_prime_vunmap = virtgpu_gem_prime_vunmap,

	.gem_prime_mmap = virtgpu_gem_prime_mmap,



	.gem_free_object = virtio_gpu_gem_free_object,

	.gem_open_object = virtio_gpu_gem_object_open,

drivers/gpu/drm/virtio/virtgpu_drv.h

+12 −0
Original line number Diff line number Diff line
@@ -359,6 +359,18 @@ int virtio_gpu_object_get_sg_table(struct virtio_gpu_device *qdev, 
void virtio_gpu_object_free_sg_table(struct virtio_gpu_object *bo);

int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait);



/* virtgpu_prime.c */

int virtgpu_gem_prime_pin(struct drm_gem_object *obj);

void virtgpu_gem_prime_unpin(struct drm_gem_object *obj);

struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);

struct drm_gem_object *virtgpu_gem_prime_import_sg_table(

        struct drm_device *dev, struct dma_buf_attachment *attach,

        struct sg_table *sgt);

void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj);

void virtgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

int virtgpu_gem_prime_mmap(struct drm_gem_object *obj,

                                struct vm_area_struct *vma);



static inline struct virtio_gpu_object*

virtio_gpu_object_ref(struct virtio_gpu_object *bo)

{

drivers/gpu/drm/virtio/virtgpu_prime.c

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2014 Canonical

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Andreas Pokorny

 */



#include "virtgpu_drv.h"



/* Empty Implementations as there should not be any other driver for a virtual

 * device that might share buffers with virtgpu */



int virtgpu_gem_prime_pin(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

	return -ENODEV;

}



void virtgpu_gem_prime_unpin(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

}





struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

	return ERR_PTR(-ENODEV);

}



struct drm_gem_object *virtgpu_gem_prime_import_sg_table(

	struct drm_device *dev, struct dma_buf_attachment *attach,

	struct sg_table *table)

{

	WARN_ONCE(1, "not implemented");

	return ERR_PTR(-ENODEV);

}



void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

	return ERR_PTR(-ENODEV);

}



void virtgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)

{

	WARN_ONCE(1, "not implemented");

}



int virtgpu_gem_prime_mmap(struct drm_gem_object *obj,

		       struct vm_area_struct *area)

{

	return -ENODEV;

}