drm/vmwgfx: Re-implement the stream resource as a simple resource. (9f7d1480) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/vmwgfx/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,6 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
		vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o \
		vmwgfx_cmdbuf_res.o vmwgfx_cmdbuf.o vmwgfx_stdu.o \
		vmwgfx_cotable.o vmwgfx_so.o vmwgfx_binding.o vmwgfx_msg.o \
		vmwgfx_simple_resource.o
		vmwgfx_simple_resource.o vmwgfx_va.o

		obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

+0 −254

Original line number	Diff line number	Diff line
		@@ -45,31 +45,6 @@ struct vmw_bo_user_rep {
		uint64_t map_handle;
		};

		struct vmw_stream {
		struct vmw_resource res;
		uint32_t stream_id;
		};

		struct vmw_user_stream {
		struct ttm_base_object base;
		struct vmw_stream stream;
		};


		static uint64_t vmw_user_stream_size;

		static const struct vmw_res_func vmw_stream_func = {
		.res_type = vmw_res_stream,
		.needs_backup = false,
		.may_evict = false,
		.type_name = "video streams",
		.backup_placement = NULL,
		.create = NULL,
		.destroy = NULL,
		.bind = NULL,
		.unbind = NULL
		};

		static inline struct vmw_dma_buffer *
		vmw_dma_buffer(struct ttm_buffer_object *bo)
		{
		@@ -259,24 +234,6 @@ void vmw_resource_activate(struct vmw_resource *res,
		write_unlock(&dev_priv->resource_lock);
		}

		static struct vmw_resource vmw_resource_lookup(struct vmw_private dev_priv,
		struct idr *idr, int id)
		{
		struct vmw_resource *res;

		read_lock(&dev_priv->resource_lock);
		res = idr_find(idr, id);
		if (!res \|\| !res->avail \|\| !kref_get_unless_zero(&res->kref))
		res = NULL;

		read_unlock(&dev_priv->resource_lock);

		if (unlikely(res == NULL))
		return NULL;

		return res;
		}

		/**
		* vmw_user_resource_lookup_handle - lookup a struct resource from a
		* TTM user-space handle and perform basic type checks
		@@ -776,217 +733,6 @@ int vmw_user_dmabuf_reference(struct ttm_object_file *tfile,
		TTM_REF_USAGE, NULL);
		}

		/*
		* Stream management
		*/

		static void vmw_stream_destroy(struct vmw_resource *res)
		{
		struct vmw_private *dev_priv = res->dev_priv;
		struct vmw_stream *stream;
		int ret;

		DRM_INFO("%s: unref\n", __func__);
		stream = container_of(res, struct vmw_stream, res);

		ret = vmw_overlay_unref(dev_priv, stream->stream_id);
		WARN_ON(ret != 0);
		}

		static int vmw_stream_init(struct vmw_private *dev_priv,
		struct vmw_stream *stream,
		void (res_free) (struct vmw_resource res))
		{
		struct vmw_resource *res = &stream->res;
		int ret;

		ret = vmw_resource_init(dev_priv, res, false, res_free,
		&vmw_stream_func);

		if (unlikely(ret != 0)) {
		if (res_free == NULL)
		kfree(stream);
		else
		res_free(&stream->res);
		return ret;
		}

		ret = vmw_overlay_claim(dev_priv, &stream->stream_id);
		if (ret) {
		vmw_resource_unreference(&res);
		return ret;
		}

		DRM_INFO("%s: claimed\n", __func__);

		vmw_resource_activate(&stream->res, vmw_stream_destroy);
		return 0;
		}

		static void vmw_user_stream_free(struct vmw_resource *res)
		{
		struct vmw_user_stream *stream =
		container_of(res, struct vmw_user_stream, stream.res);
		struct vmw_private *dev_priv = res->dev_priv;

		ttm_base_object_kfree(stream, base);
		ttm_mem_global_free(vmw_mem_glob(dev_priv),
		vmw_user_stream_size);
		}

		/**
		* This function is called when user space has no more references on the
		* base object. It releases the base-object's reference on the resource object.
		*/

		static void vmw_user_stream_base_release(struct ttm_base_object **p_base)
		{
		struct ttm_base_object base = p_base;
		struct vmw_user_stream *stream =
		container_of(base, struct vmw_user_stream, base);
		struct vmw_resource *res = &stream->stream.res;

		*p_base = NULL;
		vmw_resource_unreference(&res);
		}

		int vmw_stream_unref_ioctl(struct drm_device dev, void data,
		struct drm_file *file_priv)
		{
		struct vmw_private *dev_priv = vmw_priv(dev);
		struct vmw_resource *res;
		struct vmw_user_stream *stream;
		struct drm_vmw_stream_arg arg = (struct drm_vmw_stream_arg )data;
		struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;
		struct idr *idr = &dev_priv->res_idr[vmw_res_stream];
		int ret = 0;


		res = vmw_resource_lookup(dev_priv, idr, arg->stream_id);
		if (unlikely(res == NULL))
		return -EINVAL;

		if (res->res_free != &vmw_user_stream_free) {
		ret = -EINVAL;
		goto out;
		}

		stream = container_of(res, struct vmw_user_stream, stream.res);
		if (stream->base.tfile != tfile) {
		ret = -EINVAL;
		goto out;
		}

		ttm_ref_object_base_unref(tfile, stream->base.hash.key, TTM_REF_USAGE);
		out:
		vmw_resource_unreference(&res);
		return ret;
		}

		int vmw_stream_claim_ioctl(struct drm_device dev, void data,
		struct drm_file *file_priv)
		{
		struct vmw_private *dev_priv = vmw_priv(dev);
		struct vmw_user_stream *stream;
		struct vmw_resource *res;
		struct vmw_resource *tmp;
		struct drm_vmw_stream_arg arg = (struct drm_vmw_stream_arg )data;
		struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;
		int ret;

		/*
		* Approximate idr memory usage with 128 bytes. It will be limited
		* by maximum number_of streams anyway?
		*/

		if (unlikely(vmw_user_stream_size == 0))
		vmw_user_stream_size = ttm_round_pot(sizeof(*stream)) + 128;

		ret = ttm_read_lock(&dev_priv->reservation_sem, true);
		if (unlikely(ret != 0))
		return ret;

		ret = ttm_mem_global_alloc(vmw_mem_glob(dev_priv),
		vmw_user_stream_size,
		false, true);
		ttm_read_unlock(&dev_priv->reservation_sem);
		if (unlikely(ret != 0)) {
		if (ret != -ERESTARTSYS)
		DRM_ERROR("Out of graphics memory for stream"
		" creation.\n");

		goto out_ret;
		}

		stream = kmalloc(sizeof(*stream), GFP_KERNEL);
		if (unlikely(stream == NULL)) {
		ttm_mem_global_free(vmw_mem_glob(dev_priv),
		vmw_user_stream_size);
		ret = -ENOMEM;
		goto out_ret;
		}

		res = &stream->stream.res;
		stream->base.shareable = false;
		stream->base.tfile = NULL;

		/*
		* From here on, the destructor takes over resource freeing.
		*/

		ret = vmw_stream_init(dev_priv, &stream->stream, vmw_user_stream_free);
		if (unlikely(ret != 0))
		goto out_ret;

		tmp = vmw_resource_reference(res);
		ret = ttm_base_object_init(tfile, &stream->base, false, VMW_RES_STREAM,
		&vmw_user_stream_base_release, NULL);

		if (unlikely(ret != 0)) {
		vmw_resource_unreference(&tmp);
		goto out_err;
		}

		arg->stream_id = res->id;
		out_err:
		vmw_resource_unreference(&res);
		out_ret:
		return ret;
		}

		int vmw_user_stream_lookup(struct vmw_private *dev_priv,
		struct ttm_object_file *tfile,
		uint32_t inout_id, struct vmw_resource *out)
		{
		struct vmw_user_stream *stream;
		struct vmw_resource *res;
		int ret;

		res = vmw_resource_lookup(dev_priv, &dev_priv->res_idr[vmw_res_stream],
		*inout_id);
		if (unlikely(res == NULL))
		return -EINVAL;

		if (res->res_free != &vmw_user_stream_free) {
		ret = -EINVAL;
		goto err_ref;
		}

		stream = container_of(res, struct vmw_user_stream, stream.res);
		if (stream->base.tfile != tfile) {
		ret = -EPERM;
		goto err_ref;
		}

		*inout_id = stream->stream.stream_id;
		*out = res;
		return 0;
		err_ref:
		vmw_resource_unreference(&res);
		return ret;
		}


		/**
		* vmw_dumb_create - Create a dumb kms buffer
		*

drivers/gpu/drm/vmwgfx/vmwgfx_va.c

0 → 100644

+168 −0

Original line number	Diff line number	Diff line
		/**************************************************************************
		*
		* Copyright © 2012-2016 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.
		*
		**************************************************************************/

		#include "vmwgfx_drv.h"
		#include "vmwgfx_resource_priv.h"

		/**
		* struct vmw_stream - Overlay stream simple resource.
		* @sres: The simple resource we derive from.
		* @stream_id: The overlay stream id.
		*/
		struct vmw_stream {
		struct vmw_simple_resource sres;
		u32 stream_id;
		};

		/**
		* vmw_stream - Typecast a struct vmw_resource to a struct vmw_stream.
		* @res: Pointer to the struct vmw_resource.
		*
		* Returns: Returns a pointer to the struct vmw_stream.
		*/
		static struct vmw_stream *
		vmw_stream(struct vmw_resource *res)
		{
		return container_of(res, struct vmw_stream, sres.res);
		}

		/***************************************************************************
		* Simple resource callbacks for struct vmw_stream
		**************************************************************************/
		static void vmw_stream_hw_destroy(struct vmw_resource *res)
		{
		struct vmw_private *dev_priv = res->dev_priv;
		struct vmw_stream *stream = vmw_stream(res);
		int ret;

		ret = vmw_overlay_unref(dev_priv, stream->stream_id);
		WARN_ON_ONCE(ret != 0);
		}

		static int vmw_stream_init(struct vmw_resource res, void data)
		{
		struct vmw_stream *stream = vmw_stream(res);

		return vmw_overlay_claim(res->dev_priv, &stream->stream_id);
		}

		static void vmw_stream_set_arg_handle(void *data, u32 handle)
		{
		struct drm_vmw_stream_arg arg = (struct drm_vmw_stream_arg )data;

		arg->stream_id = handle;
		}

		static const struct vmw_simple_resource_func va_stream_func = {
		.res_func = {
		.res_type = vmw_res_stream,
		.needs_backup = false,
		.may_evict = false,
		.type_name = "overlay stream",
		.backup_placement = NULL,
		.create = NULL,
		.destroy = NULL,
		.bind = NULL,
		.unbind = NULL
		},
		.ttm_res_type = VMW_RES_STREAM,
		.size = sizeof(struct vmw_stream),
		.init = vmw_stream_init,
		.hw_destroy = vmw_stream_hw_destroy,
		.set_arg_handle = vmw_stream_set_arg_handle,
		};

		/***************************************************************************
		* End simple resource callbacks for struct vmw_stream
		**************************************************************************/

		/**
		* vmw_stream_unref_ioctl - Ioctl to unreference a user-space handle to
		* a struct vmw_stream.
		* @dev: Pointer to the drm device.
		* @data: The ioctl argument
		* @file_priv: Pointer to a struct drm_file identifying the caller.
		*
		* Return:
		* 0 if successful.
		* Negative error value on failure.
		*/
		int vmw_stream_unref_ioctl(struct drm_device dev, void data,
		struct drm_file *file_priv)
		{
		struct drm_vmw_stream_arg arg = (struct drm_vmw_stream_arg )data;

		return ttm_ref_object_base_unref(vmw_fpriv(file_priv)->tfile,
		arg->stream_id, TTM_REF_USAGE);
		}

		/**
		* vmw_stream_claim_ioctl - Ioctl to claim a struct vmw_stream overlay.
		* @dev: Pointer to the drm device.
		* @data: The ioctl argument
		* @file_priv: Pointer to a struct drm_file identifying the caller.
		*
		* Return:
		* 0 if successful.
		* Negative error value on failure.
		*/
		int vmw_stream_claim_ioctl(struct drm_device dev, void data,
		struct drm_file *file_priv)
		{
		return vmw_simple_resource_create_ioctl(dev, data, file_priv,
		&va_stream_func);
		}

		/**
		* vmw_user_stream_lookup - Look up a struct vmw_user_stream from a handle.
		* @dev_priv: Pointer to a struct vmw_private.
		* @tfile: struct ttm_object_file identifying the caller.
		* @inout_id: In: The user-space handle. Out: The stream id.
		* @out: On output contains a refcounted pointer to the embedded
		* struct vmw_resource.
		*
		* Return:
		* 0 if successful.
		* Negative error value on failure.
		*/
		int vmw_user_stream_lookup(struct vmw_private *dev_priv,
		struct ttm_object_file *tfile,
		uint32_t inout_id, struct vmw_resource *out)
		{
		struct vmw_stream *stream;
		struct vmw_resource *res =
		vmw_simple_resource_lookup(tfile, *inout_id, &va_stream_func);

		if (IS_ERR(res))
		return PTR_ERR(res);

		stream = vmw_stream(res);
		*inout_id = stream->stream_id;
		*out = res;

		return 0;
		}