drm/virtio: remove virtio_gpu_alloc_object (2e0d9ee4) · Commits · 戴 / test

drivers/gpu/drm/virtio/virtgpu_drv.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -229,10 +229,6 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
		struct drm_file *file);
		void virtio_gpu_gem_object_close(struct drm_gem_object *obj,
		struct drm_file *file);
		struct virtio_gpu_object*
		virtio_gpu_alloc_object(struct drm_device *dev,
		struct virtio_gpu_object_params *params,
		struct virtio_gpu_fence *fence);
		int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
		struct drm_device *dev,
		struct drm_mode_create_dumb *args);

+4 −19

Original line number	Diff line number	Diff line
		@@ -28,35 +28,20 @@

		#include "virtgpu_drv.h"

		struct virtio_gpu_object*
		virtio_gpu_alloc_object(struct drm_device *dev,
		struct virtio_gpu_object_params *params,
		struct virtio_gpu_fence *fence)
		{
		struct virtio_gpu_device *vgdev = dev->dev_private;
		struct virtio_gpu_object *obj;
		int ret;

		ret = virtio_gpu_object_create(vgdev, params, &obj, fence);
		if (ret)
		return ERR_PTR(ret);

		return obj;
		}

		int virtio_gpu_gem_create(struct drm_file *file,
		struct drm_device *dev,
		struct virtio_gpu_object_params *params,
		struct drm_gem_object **obj_p,
		uint32_t *handle_p)
		{
		struct virtio_gpu_device *vgdev = dev->dev_private;
		struct virtio_gpu_object *obj;
		int ret;
		u32 handle;

		obj = virtio_gpu_alloc_object(dev, params, NULL);
		if (IS_ERR(obj))
		return PTR_ERR(obj);
		ret = virtio_gpu_object_create(vgdev, params, &obj, NULL);
		if (ret < 0)
		return ret;

		ret = drm_gem_handle_create(file, &obj->base.base, &handle);
		if (ret) {

+3 −3

Original line number	Diff line number	Diff line
		@@ -256,10 +256,10 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device dev, void data,
		fence = virtio_gpu_fence_alloc(vgdev);
		if (!fence)
		return -ENOMEM;
		qobj = virtio_gpu_alloc_object(dev, &params, fence);
		ret = virtio_gpu_object_create(vgdev, &params, &qobj, fence);
		dma_fence_put(&fence->f);
		if (IS_ERR(qobj))
		return PTR_ERR(qobj);
		if (ret < 0)
		return ret;
		obj = &qobj->base.base;

		ret = drm_gem_handle_create(file_priv, obj, &handle);