Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3ca97fd authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Alistair Delva
Browse files

UPSTREAM: drm/virtio: drop prime import/export callbacks 



Also set prime_handle_to_fd and prime_fd_to_handle to NULL,
so drm will not advertive DRM_PRIME_CAP_{IMPORT,EXPORT} to
userspace.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190110111545.26768-1-kraxel@redhat.com


(cherry picked from commit b318e3ff7ca065d6b107e424c85a63d7a6798a69)
Signed-off-by: default avatarGreg Hartman <ghartman@google.com>
BUG: 139386237
Change-Id: I604c266f985e52764924eb6deb5363bc7c01853e
parent 67456f42

drivers/gpu/drm/virtio/virtgpu_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -134,14 +134,10 @@ static struct drm_driver driver = { 
#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = virtio_gpu_debugfs_init,

#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,

drivers/gpu/drm/virtio/virtgpu_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -360,10 +360,6 @@ 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,

drivers/gpu/drm/virtio/virtgpu_prime.c

+0 −14
Original line number Diff line number Diff line
@@ -39,20 +39,6 @@ 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)

{

	struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);