drm/vmwgfx: Call vmw_driver_{load, unload}() before registering device
Subsystems (3)
Thomas Zimmermann
maintainerPATCH v2 1/1 drm/vmwgfx: Call vmw_driver_{load, unload}() before registering device
The load/unload callbacks in struct drm_driver are deprecated. Remove them and call functions explicitly.
v2:
* remove accidental whitespace fix
Signed-off-by Thomas Zimmermann <[email protected]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 42 +++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 5 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +37 -5
@@ -28,10 +28,10 @@#include <linux/console.h> #include <linux/dma-mapping.h> #include <linux/module.h> +#include <linux/pci.h> #include <drm/drm_drv.h> #include <drm/drm_ioctl.h> -#include <drm/drm_pci.h> #include <drm/drm_sysfs.h> #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_module.h>
@@ -1212,8 +1212,10 @@ static void vmw_remove(struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); +drm_dev_unregister (dev); +vmw_driver_unload (dev); +drm_dev_put (dev);pci_disable_device (pdev); -drm_put_dev (dev); } static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
@@ -1392,8 +1394,6 @@ static const struct file_operations vmwgfx_driver_fops = {static struct drm_driver driver = { .driver_features =DRIVER_MODESET |DRIVER_RENDER |DRIVER_ATOMIC , - .load = vmw_driver_load, - .unload = vmw_driver_unload, .get_vblank_counter = vmw_get_vblank_counter, .enable_vblank = vmw_enable_vblank, .disable_vblank = vmw_disable_vblank,
@@ -1432,7 +1432,39 @@ static struct pci_driver vmw_pci_driver = {static int vmw_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { -return drm_get_pci_dev (pdev, ent, &driver); +struct drm_device *dev; +int ret; + + ret =pci_enable_device (pdev); +if (ret) +return ret; + + dev =drm_dev_alloc (&driver, &pdev->dev); +if (IS_ERR (dev)) { + ret =PTR_ERR (dev); + goto err_pci_disable_device; + } + + dev->pdev = pdev; +pci_set_drvdata (pdev, dev); + + ret =vmw_driver_load (dev, ent->driver_data); +if (ret) + goto err_drm_dev_put; + + ret =drm_dev_register (dev, ent->driver_data); +if (ret) + goto err_vmw_driver_unload; + +return 0 ; + +err_vmw_driver_unload: +vmw_driver_unload (dev); +err_drm_dev_put: +drm_dev_put (dev); +err_pci_disable_device: +pci_disable_device (pdev); +return ret; }static int __init vmwgfx_init (void )
Signature · 6 lines
2.24.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2] drm/vmwgfx: Call vmw_driver_{load,unload}() before registering device
Quoted 8 lines · Thomas Zimmermann
The load/unload callbacks in struct
drm_driverare deprecated. Remove them and call functions explicitly.v2:
* remove accidental whitespace fixSigned-off-by Thomas Zimmermann <[email protected]>---
Reviewed-by Thomas Hellstrom <[email protected]>
I'll take this through vmwgfx-next unless told otherwise.
Thanks,
Thomas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel