[PATCH 1/4] drm/vgem: Fix vgem_init to get drm device avaliable.

Daniel Vetter daniel at ffwll.ch
Wed Mar 28 07:16:36 UTC 2018


On Wed, Mar 28, 2018 at 02:24:48AM +0100, Emil Velikov wrote:
> From: Deepak Sharma <deepak.sharma at amd.com>
> 
> Modify vgem_init to take platform dev as parent in drm_dev_init.
> This will make drm device available at "/sys/devices/platform/vgem"
> in x86 chromebook.
> 
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Deepak Sharma <deepak.sharma at amd.com>
> Reviewed-by: Sean Paul <seanpaul at chromium.org>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/vgem/vgem_drv.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
> index 2524ff116f00..636ce32fa945 100644
> --- a/drivers/gpu/drm/vgem/vgem_drv.c
> +++ b/drivers/gpu/drm/vgem/vgem_drv.c
> @@ -472,31 +472,30 @@ static int __init vgem_init(void)
>  	if (!vgem_device)
>  		return -ENOMEM;
>  
> -	ret = drm_dev_init(&vgem_device->drm, &vgem_driver, NULL);
> -	if (ret)
> -		goto out_free;
> -
>  	vgem_device->platform =
>  		platform_device_register_simple("vgem", -1, NULL, 0);
>  	if (IS_ERR(vgem_device->platform)) {
>  		ret = PTR_ERR(vgem_device->platform);
> -		goto out_fini;
> +		goto out_free;
>  	}
>  
>  	dma_coerce_mask_and_coherent(&vgem_device->platform->dev,
>  				     DMA_BIT_MASK(64));
> +	ret = drm_dev_init(&vgem_device->drm, &vgem_driver, &vgem_device->platform->dev);
> +	if (ret)
> +		goto out_unregister;
>  
>  	/* Final step: expose the device/driver to userspace */
>  	ret  = drm_dev_register(&vgem_device->drm, 0);
>  	if (ret)
> -		goto out_unregister;
> +		goto out_fini;
>  
>  	return 0;
>  
> -out_unregister:
> -	platform_device_unregister(vgem_device->platform);
>  out_fini:
>  	drm_dev_fini(&vgem_device->drm);
> +out_unregister:
> +	platform_device_unregister(vgem_device->platform);
>  out_free:
>  	kfree(vgem_device);
>  	return ret;
> -- 
> 2.16.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list