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

Commit ab042b82 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

Revert "drm/qxl: drop prime import/export callbacks" 



This reverts commit f4c34b1e.

Simliar to commit a0cecc23 Revert "drm/virtio: drop prime
import/export callbacks".  We have to do the same with qxl,
for the same reasons (it breaks DRI3).

Drop the WARN_ON_ONCE().

Fixes: f4c34b1e ("drm/qxl: drop prime import/export callbacks")
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190426053324.26443-1-kraxel@redhat.com


Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
parent c4cba44e

drivers/gpu/drm/qxl/qxl_drv.c

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

	.debugfs_init = qxl_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 = qxl_gem_prime_pin,

	.gem_prime_unpin = qxl_gem_prime_unpin,

	.gem_prime_get_sg_table = qxl_gem_prime_get_sg_table,

	.gem_prime_import_sg_table = qxl_gem_prime_import_sg_table,

	.gem_prime_vmap = qxl_gem_prime_vmap,

	.gem_prime_vunmap = qxl_gem_prime_vunmap,

	.gem_prime_mmap = qxl_gem_prime_mmap,

drivers/gpu/drm/qxl/qxl_prime.c

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,18 @@ void qxl_gem_prime_unpin(struct drm_gem_object *obj) 
	qxl_bo_unpin(bo);

}



struct sg_table *qxl_gem_prime_get_sg_table(struct drm_gem_object *obj)

{

	return ERR_PTR(-ENOSYS);

}



struct drm_gem_object *qxl_gem_prime_import_sg_table(

	struct drm_device *dev, struct dma_buf_attachment *attach,

	struct sg_table *table)

{

	return ERR_PTR(-ENOSYS);

}



void *qxl_gem_prime_vmap(struct drm_gem_object *obj)

{

	struct qxl_bo *bo = gem_to_qxl_bo(obj);