drm/vmwgfx: Hook up the prime ioctls (69977ff5) · Commits · e / devices / android_kernel_samsung_universal8890

drivers/gpu/drm/vmwgfx/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,6 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
		vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \
		vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \
		vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \
		vmwgfx_surface.o
		vmwgfx_surface.o vmwgfx_prime.o

		obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -677,7 +677,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
		}

		dev_priv->tdev = ttm_object_device_init
		(dev_priv->mem_global_ref.object, 12);
		(dev_priv->mem_global_ref.object, 12, &vmw_prime_dmabuf_ops);

		if (unlikely(dev_priv->tdev == NULL)) {
		DRM_ERROR("Unable to initialize TTM object management.\n");
		@@ -1210,7 +1210,7 @@ static const struct file_operations vmwgfx_driver_fops = {

		static struct drm_driver driver = {
		.driver_features = DRIVER_HAVE_IRQ \| DRIVER_IRQ_SHARED \|
		DRIVER_MODESET,
		DRIVER_MODESET \| DRIVER_PRIME,
		.load = vmw_driver_load,
		.unload = vmw_driver_unload,
		.lastclose = vmw_lastclose,
		@@ -1235,6 +1235,9 @@ static struct drm_driver driver = {
		.dumb_map_offset = vmw_dumb_map_offset,
		.dumb_destroy = vmw_dumb_destroy,

		.prime_fd_to_handle = vmw_prime_fd_to_handle,
		.prime_handle_to_fd = vmw_prime_handle_to_fd,

		.fops = &vmwgfx_driver_fops,
		.name = VMWGFX_DRIVER_NAME,
		.desc = VMWGFX_DRIVER_DESC,

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -818,6 +818,20 @@ int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv);

		extern const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;

		/**
		* Prime - vmwgfx_prime.c
		*/

		extern const struct dma_buf_ops vmw_prime_dmabuf_ops;
		extern int vmw_prime_fd_to_handle(struct drm_device *dev,
		struct drm_file *file_priv,
		int fd, u32 *handle);
		extern int vmw_prime_handle_to_fd(struct drm_device *dev,
		struct drm_file *file_priv,
		uint32_t handle, uint32_t flags,
		int *prime_fd);


		/**
		* Inline helper functions
		*/

drivers/gpu/drm/vmwgfx/vmwgfx_prime.c

0 → 100644

+137 −0

Original line number	Diff line number	Diff line
		/**************************************************************************
		*
		* Copyright © 2013 VMware, Inc., Palo Alto, CA., USA
		* All Rights Reserved.
		*
		* 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, sub license, 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 (including the
		* next paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
		* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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:
		* Thomas Hellstrom <thellstrom@vmware.com>
		*
		*/

		#include "vmwgfx_drv.h"
		#include <linux/dma-buf.h>
		#include <drm/ttm/ttm_object.h>

		/*
		* DMA-BUF attach- and mapping methods. No need to implement
		* these until we have other virtual devices use them.
		*/

		static int vmw_prime_map_attach(struct dma_buf *dma_buf,
		struct device *target_dev,
		struct dma_buf_attachment *attach)
		{
		return -ENOSYS;
		}

		static void vmw_prime_map_detach(struct dma_buf *dma_buf,
		struct dma_buf_attachment *attach)
		{
		}

		static struct sg_table vmw_prime_map_dma_buf(struct dma_buf_attachment attach,
		enum dma_data_direction dir)
		{
		return ERR_PTR(-ENOSYS);
		}

		static void vmw_prime_unmap_dma_buf(struct dma_buf_attachment *attach,
		struct sg_table *sgb,
		enum dma_data_direction dir)
		{
		}

		static void vmw_prime_dmabuf_vmap(struct dma_buf dma_buf)
		{
		return NULL;
		}

		static void vmw_prime_dmabuf_vunmap(struct dma_buf dma_buf, void vaddr)
		{
		}

		static void vmw_prime_dmabuf_kmap_atomic(struct dma_buf dma_buf,
		unsigned long page_num)
		{
		return NULL;
		}

		static void vmw_prime_dmabuf_kunmap_atomic(struct dma_buf *dma_buf,
		unsigned long page_num, void *addr)
		{

		}
		static void vmw_prime_dmabuf_kmap(struct dma_buf dma_buf,
		unsigned long page_num)
		{
		return NULL;
		}

		static void vmw_prime_dmabuf_kunmap(struct dma_buf *dma_buf,
		unsigned long page_num, void *addr)
		{

		}

		static int vmw_prime_dmabuf_mmap(struct dma_buf *dma_buf,
		struct vm_area_struct *vma)
		{
		WARN_ONCE(true, "Attempted use of dmabuf mmap. Bad.\n");
		return -ENOSYS;
		}

		const struct dma_buf_ops vmw_prime_dmabuf_ops = {
		.attach = vmw_prime_map_attach,
		.detach = vmw_prime_map_detach,
		.map_dma_buf = vmw_prime_map_dma_buf,
		.unmap_dma_buf = vmw_prime_unmap_dma_buf,
		.release = NULL,
		.kmap = vmw_prime_dmabuf_kmap,
		.kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
		.kunmap = vmw_prime_dmabuf_kunmap,
		.kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
		.mmap = vmw_prime_dmabuf_mmap,
		.vmap = vmw_prime_dmabuf_vmap,
		.vunmap = vmw_prime_dmabuf_vunmap,
		};

		int vmw_prime_fd_to_handle(struct drm_device *dev,
		struct drm_file *file_priv,
		int fd, u32 *handle)
		{
		struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;

		return ttm_prime_fd_to_handle(tfile, fd, handle);
		}

		int vmw_prime_handle_to_fd(struct drm_device *dev,
		struct drm_file *file_priv,
		uint32_t handle, uint32_t flags,
		int *prime_fd)
		{
		struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;

		return ttm_prime_handle_to_fd(tfile, handle, flags, prime_fd);
		}