Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'drm-fixes-2019-05-03' of git://anongit.freedesktop.org/drm/drm
Pull drm fix from Dave Airlie:
"Just a single qxl revert"
* tag 'drm-fixes-2019-05-03' of git://anongit.freedesktop.org/drm/drm:
Revert "drm/qxl: drop prime import/export callbacks"
+16
+4
drivers/gpu/drm/qxl/qxl_drv.c
+4
drivers/gpu/drm/qxl/qxl_drv.c
···
255
255
#if defined(CONFIG_DEBUG_FS)
256
256
.debugfs_init = qxl_debugfs_init,
257
257
#endif
258
+
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
259
+
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
258
260
.gem_prime_export = drm_gem_prime_export,
259
261
.gem_prime_import = drm_gem_prime_import,
260
262
.gem_prime_pin = qxl_gem_prime_pin,
261
263
.gem_prime_unpin = qxl_gem_prime_unpin,
264
+
.gem_prime_get_sg_table = qxl_gem_prime_get_sg_table,
265
+
.gem_prime_import_sg_table = qxl_gem_prime_import_sg_table,
262
266
.gem_prime_vmap = qxl_gem_prime_vmap,
263
267
.gem_prime_vunmap = qxl_gem_prime_vunmap,
264
268
.gem_prime_mmap = qxl_gem_prime_mmap,
+12
drivers/gpu/drm/qxl/qxl_prime.c
+12
drivers/gpu/drm/qxl/qxl_prime.c
···
42
42
qxl_bo_unpin(bo);
43
43
}
44
44
45
+
struct sg_table *qxl_gem_prime_get_sg_table(struct drm_gem_object *obj)
46
+
{
47
+
return ERR_PTR(-ENOSYS);
48
+
}
49
+
50
+
struct drm_gem_object *qxl_gem_prime_import_sg_table(
51
+
struct drm_device *dev, struct dma_buf_attachment *attach,
52
+
struct sg_table *table)
53
+
{
54
+
return ERR_PTR(-ENOSYS);
55
+
}
56
+
45
57
void *qxl_gem_prime_vmap(struct drm_gem_object *obj)
46
58
{
47
59
struct qxl_bo *bo = gem_to_qxl_bo(obj);