drm/virtio: drop prime import/export callbacks
Subsystems (4)
Gerd Hoffmann
maintainerPATCH 1/1 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.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ---- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ---- drivers/gpu/drm/virtio/virtgpu_prime.c | 14 -------------- 3 files changed, 22 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -4
@@ -354,10 +354,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_drv.c +0 -4
@@ -205,14 +205,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_prime.c +0 -14
@@ -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);
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 5 lines · Gerd Hoffmann
Also set
prime_handle_to_fdandprime_fd_to_handleto NULL, so drm will not advertive DRM_PRIME_CAP_{IMPORT,EXPORT} to userspace.Signed-off-by Gerd Hoffmann <[email protected]>
Quoted 55 lines
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ---- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ---- drivers/gpu/drm/virtio/virtgpu_prime.c | 14 -------------- 3 files changed, 22 deletions(-)drivers/gpu/drm/virtio/virtgpu_drv.h +0
-4@@ -354,10 +354,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_drv.c +0
-4@@ -205,14 +205,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_prime.c +0
-7@@ -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(
drivers/gpu/drm/virtio/virtgpu_prime.c void virtgpu_gem_prime_unpin(struct drm_gem_object *obj) · line 44
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_prime.c +0
-7- 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);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines · Gerd Hoffmann
Also set
prime_handle_to_fdandprime_fd_to_handleto NULL, so drm will not advertive DRM_PRIME_CAP_{IMPORT,EXPORT} to userspace.
Quoted 74 lines
Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ---- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ---- drivers/gpu/drm/virtio/virtgpu_prime.c | 14 -------------- 3 files changed, 22 deletions(-)drivers/gpu/drm/virtio/virtgpu_drv.h +0
-4@@ -354,10 +354,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_drv.c +0
-4@@ -205,14 +205,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_prime.c +0
-15@@ -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); --2.9.3
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines · Gerd Hoffmann
Also set
prime_handle_to_fdandprime_fd_to_handleto NULL, so drm will not advertive DRM_PRIME_CAP_{IMPORT,EXPORT} to userspace.
Quoted 70 lines
Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ---- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ---- drivers/gpu/drm/virtio/virtgpu_prime.c | 14 -------------- 3 files changed, 22 deletions(-)drivers/gpu/drm/virtio/virtgpu_drv.h +0
-4@@ -354,10 +354,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_drv.c +0
-4@@ -205,14 +205,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_prime.c +0
-15@@ -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); --2.9.3
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel