public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/vgem: Convert to a struct drm_device subclass

Browse source 
With Laura's introduction of the fake platform device for importing
dmabuf, we add a second static that is logically tied to the vgem_device.
Convert vgem over to using the struct drm_device subclassing, so that
the platform device is stored inside its owner.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170508132228.9509-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2017-05-08 14:22:28 +01:00 • committed by Daniel Vetter
parent 94d7fb4982
commit 315f0242aa
1 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
drivers/gpu/drm/vgem/vgem_drv.c
View file

@ -42,7 +42,10 @@
#define DRIVER_MAJOR 1 #define DRIVER_MAJOR 1
#define DRIVER_MINOR 0 #define DRIVER_MINOR 0
static struct platform_device *vgem_platform; static struct vgem_device {
struct drm_device drm;
struct platform_device *platform;
} *vgem_device;
static void vgem_gem_free_object(struct drm_gem_object *obj) static void vgem_gem_free_object(struct drm_gem_object *obj)
{ {
@ -307,7 +310,9 @@ static struct sg_table *vgem_prime_get_sg_table(struct drm_gem_object *obj)
static struct drm_gem_object* vgem_prime_import(struct drm_device *dev, static struct drm_gem_object* vgem_prime_import(struct drm_device *dev,
struct dma_buf *dma_buf) struct dma_buf *dma_buf)
{ {
return drm_gem_prime_import_dev(dev, dma_buf, &vgem_platform->dev); struct vgem_device *vgem = container_of(dev, typeof(*vgem), drm);
return drm_gem_prime_import_dev(dev, dma_buf, &vgem->platform->dev);
} }
static struct drm_gem_object *vgem_prime_import_sg_table(struct drm_device *dev, static struct drm_gem_object *vgem_prime_import_sg_table(struct drm_device *dev,
@ -377,8 +382,19 @@ static int vgem_prime_mmap(struct drm_gem_object *obj,
return 0; return 0;
} }
static void vgem_release(struct drm_device *dev)
{
struct vgem_device *vgem = container_of(dev, typeof(*vgem), drm);
platform_device_unregister(vgem->platform);
drm_dev_fini(&vgem->drm);
kfree(vgem);
}
static struct drm_driver vgem_driver = { static struct drm_driver vgem_driver = {
.driver_features = DRIVER_GEM | DRIVER_PRIME, .driver_features = DRIVER_GEM | DRIVER_PRIME,
.release = vgem_release,
.open = vgem_open, .open = vgem_open,
.postclose = vgem_postclose, .postclose = vgem_postclose,
.gem_free_object_unlocked = vgem_gem_free_object, .gem_free_object_unlocked = vgem_gem_free_object,
@ -408,45 +424,48 @@ static struct drm_driver vgem_driver = {
.minor = DRIVER_MINOR, .minor = DRIVER_MINOR,
}; };
static struct drm_device *vgem_device;
static int __init vgem_init(void) static int __init vgem_init(void)
{ {
int ret; int ret;
vgem_device = drm_dev_alloc(&vgem_driver, NULL); vgem_device = kzalloc(sizeof(*vgem_device), GFP_KERNEL);
if (IS_ERR(vgem_device)) if (!vgem_device)
return PTR_ERR(vgem_device); return -ENOMEM;
vgem_platform = platform_device_register_simple("vgem", ret = drm_dev_init(&vgem_device->drm, &vgem_driver, NULL);
-1, NULL, 0); if (ret)
goto out_free;
if (!vgem_platform) { vgem_device->platform =
platform_device_register_simple("vgem", -1, NULL, 0);
if (!vgem_device->platform) {
ret = -ENODEV; ret = -ENODEV;
goto out; goto out_fini;
} }
dma_coerce_mask_and_coherent(&vgem_platform->dev, dma_coerce_mask_and_coherent(&vgem_device->platform->dev,
DMA_BIT_MASK(64)); DMA_BIT_MASK(64));
ret = drm_dev_register(vgem_device, 0); /* Final step: expose the device/driver to userspace */
ret = drm_dev_register(&vgem_device->drm, 0);
if (ret) if (ret)
goto out_unref; goto out_unregister;
return 0; return 0;
out_unref: out_unregister:
platform_device_unregister(vgem_platform); platform_device_unregister(vgem_device->platform);
out: out_fini:
drm_dev_unref(vgem_device); drm_dev_fini(&vgem_device->drm);
out_free:
kfree(vgem_device);
return ret; return ret;
} }
static void __exit vgem_exit(void) static void __exit vgem_exit(void)
{ {
platform_device_unregister(vgem_platform); drm_dev_unregister(&vgem_device->drm);
drm_dev_unregister(vgem_device); drm_dev_unref(&vgem_device->drm);
drm_dev_unref(vgem_device);
} }
module_init(vgem_init); module_init(vgem_init);