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

Commit 1daa0449 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-05-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



- One revert for QXL for a DRI3 breakage

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190502122529.hguztj3kncaixe3d@flea
parents 37624b58 ab042b82

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