Commit bf2791eb authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/vbox: Remove empty PRIME functions 



The vbox driver uses VRAM helpers for memory management. These helpers
provide a basic implementation of PRIME functions, so the vbox driver's
empty implmentation can be removed. As a side effect of this change,
vbox can now use generic framebuffer emulation.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190702115012.4418-5-tzimmermann@suse.de
parent 80be7eed

drivers/gpu/drm/vboxvideo/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

vboxvideo-y :=  hgsmi_base.o modesetting.o vbva_base.o \

		vbox_drv.o vbox_fb.o vbox_hgsmi.o vbox_irq.o vbox_main.o \

		vbox_mode.o vbox_prime.o vbox_ttm.o

		vbox_mode.o vbox_ttm.o



obj-$(CONFIG_DRM_VBOXVIDEO) += vboxvideo.o

drivers/gpu/drm/vboxvideo/vbox_drv.c

+0 −9
Original line number Diff line number Diff line
@@ -210,15 +210,6 @@ static struct drm_driver driver = { 
	.patchlevel = DRIVER_PATCHLEVEL,



	DRM_GEM_VRAM_DRIVER,

	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_pin = vbox_gem_prime_pin,

	.gem_prime_unpin = vbox_gem_prime_unpin,

	.gem_prime_get_sg_table = vbox_gem_prime_get_sg_table,

	.gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,

	.gem_prime_vmap = vbox_gem_prime_vmap,

	.gem_prime_vunmap = vbox_gem_prime_vunmap,

	.gem_prime_mmap = vbox_gem_prime_mmap,

};



static int __init vbox_init(void)

drivers/gpu/drm/vboxvideo/vbox_drv.h

+0 −12
Original line number Diff line number Diff line
@@ -167,18 +167,6 @@ void vbox_mm_fini(struct vbox_private *vbox); 
int vbox_gem_create(struct vbox_private *vbox,

		    u32 size, bool iskernel, struct drm_gem_object **obj);



/* vbox_prime.c */

int vbox_gem_prime_pin(struct drm_gem_object *obj);

void vbox_gem_prime_unpin(struct drm_gem_object *obj);

struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj);

struct drm_gem_object *vbox_gem_prime_import_sg_table(

	struct drm_device *dev, struct dma_buf_attachment *attach,

	struct sg_table *table);

void *vbox_gem_prime_vmap(struct drm_gem_object *obj);

void vbox_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

int vbox_gem_prime_mmap(struct drm_gem_object *obj,

			struct vm_area_struct *area);



/* vbox_irq.c */

int vbox_irq_init(struct vbox_private *vbox);

void vbox_irq_fini(struct vbox_private *vbox);

drivers/gpu/drm/vboxvideo/vbox_prime.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright (C) 2017 Oracle Corporation

 * Copyright 2017 Canonical

 * Authors: Andreas Pokorny

 */



#include "vbox_drv.h"



/*

 * Based on qxl_prime.c:

 * Empty Implementations as there should not be any other driver for a virtual

 * device that might share buffers with vboxvideo

 */



int vbox_gem_prime_pin(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

	return -ENODEV;

}



void vbox_gem_prime_unpin(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

}



struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

	return ERR_PTR(-ENODEV);

}



struct drm_gem_object *vbox_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 *vbox_gem_prime_vmap(struct drm_gem_object *obj)

{

	WARN_ONCE(1, "not implemented");

	return ERR_PTR(-ENODEV);

}



void vbox_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)

{

	WARN_ONCE(1, "not implemented");

}



int vbox_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *area)

{

	WARN_ONCE(1, "not implemented");

	return -ENODEV;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE