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

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

UPSTREAM: drm/virtio: remove prime pin/unpin callbacks. 



virtio-gpu objects never move around, so effectively they are
pinned all the time.  Therefore we don't need the (optional)
pin/unpin callbacks.  Remove them.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190227144441.6755-3-kraxel@redhat.com


(cherry picked from commit 873f51d43439d554f7299e88edfb208924bef6eb)
Signed-off-by: default avatarGreg Hartman <ghartman@google.com>
BUG: 139386237
Change-Id: Ic20a17cdaef7a4764c98c47e5afbe9d98766c93a
parent 9d1aee8d

drivers/gpu/drm/virtio/virtgpu_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ static struct drm_driver driver = { 
	.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,

drivers/gpu/drm/virtio/virtgpu_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -358,8 +358,6 @@ void virtio_gpu_object_free_sg_table(struct virtio_gpu_object *bo); 
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,

drivers/gpu/drm/virtio/virtgpu_prime.c

+0 −11
Original line number Diff line number Diff line
@@ -28,17 +28,6 @@ 
 * device that might share buffers with virtgpu

 */



int virtgpu_gem_prime_pin(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

	return -ENODEV;

}



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");