drm/ast: Remove load/unload callbacks
Subsystems (3)
Thomas Zimmermann
maintainercover drm/ast: Remove load/unload callbacks
This patchset removes the load/unload callback functions from ast. Tested on AST 2100 HW.
Thomas Zimmermann (2):
drm/ast: Replace drm_get_pci_device() and drm_put_dev() drm/ast: Call struct drm_driver.{load,unload} before registering
device
drivers/gpu/drm/ast/ast_drv.c | 42 ++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-)
--
2.23.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 1/2 drm/ast: Replace drm_get_pci_device() and drm_put_dev()
Both functions are deprecated. Open-code them them in preparation of removing struct drm_driver.{load,unload}.
--- drivers/gpu/drm/ast/ast_drv.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +29 -2
@@ -86,9 +86,35 @@ static void ast_kick_out_firmware_fb(struct pci_dev *pdev)static int ast_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { +struct drm_device *dev; +int ret; +ast_kick_out_firmware_fb (pdev); -return drm_get_pci_dev (pdev, ent, &driver); + 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 =drm_dev_register (dev, ent->driver_data); +if (ret) + goto err_drm_dev_put; + +return 0 ; + +err_drm_dev_put: +drm_dev_put (dev); +err_pci_disable_device: +pci_disable_device (pdev); +return ret; } static void
@@ -96,7 +122,8 @@ ast_pci_remove(struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -drm_put_dev (dev); +drm_dev_unregister (dev); +drm_dev_put (dev); }static int ast_drm_freeze (struct drm_device *dev)
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/2] drm/ast: Replace drm_get_pci_device() and drm_put_dev()
Quoted 17 lines · Thomas Zimmermann
Both functions are deprecated. Open-code them them in preparation of removing struct drm_driver.{load,unload}.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_drv.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)drivers/gpu/drm/ast/ast_drv.c +1
-0@@ -86,9 +86,35 @@ static void ast_kick_out_firmware_fb(struct pci_dev *pdev)static int ast_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { +struct drm_device *dev;
drivers/gpu/drm/ast/ast_drv.c static void ast_kick_out_firmware_fb(struct pci_dev *pdev) · line 98
Quoted 10 lines
drivers/gpu/drm/ast/ast_drv.c +7
-1+int ret; +ast_kick_out_firmware_fb (pdev); -return drm_get_pci_dev (pdev, ent, &driver); + ret =pci_enable_device (pdev); +if (ret) +return ret; + + dev =drm_dev_alloc (&driver, &pdev->dev);
Would be nice to also switch over to embedding drm_device and drm_dev_init, but for another patch. This is
Quoted 35 lines
drivers/gpu/drm/ast/ast_drv.c +21
-1+if (IS_ERR (dev)) { + ret =PTR_ERR (dev); + goto err_pci_disable_device; + } + + dev->pdev = pdev; +pci_set_drvdata (pdev, dev); + + ret =drm_dev_register (dev, ent->driver_data); +if (ret) + goto err_drm_dev_put; + +return 0 ; + +err_drm_dev_put: +drm_dev_put (dev); +err_pci_disable_device: +pci_disable_device (pdev); +return ret; } static void@@ -96,7 +122,8 @@ ast_pci_remove(struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -drm_put_dev (dev); +drm_dev_unregister (dev); +drm_dev_put (dev); }static int ast_drm_freeze (struct drm_device *dev)Signature · 1 line
2.23.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/2] drm/ast: Replace drm_get_pci_device() and drm_put_dev()
Quoted 22 lines · Daniel Vetter
Quoted 21 lines · Thomas Zimmermann
Both functions are deprecated. Open-code them them in preparation of removing struct drm_driver.{load,unload}.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/ast/ast_drv.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)drivers/gpu/drm/ast/ast_drv.c +3
-0@@ -86,9 +86,35 @@ static void ast_kick_out_firmware_fb(struct pci_dev *pdev)static int ast_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { +struct drm_device *dev; +int ret; +ast_kick_out_firmware_fb (pdev);
Quoted 9 lines
drivers/gpu/drm/ast/ast_drv.c static void ast_kick_out_firmware_fb(struct pci_dev *pdev) · line 98
Quoted 6 lines
drivers/gpu/drm/ast/ast_drv.c +5
-1-return drm_get_pci_dev (pdev, ent, &driver); + ret =pci_enable_device (pdev); +if (ret) +return ret; + + dev =drm_dev_alloc (&driver, &pdev->dev);Would be nice to also switch over to embedding
drm_deviceanddrm_dev_init, but for another patch. This is
Even better: devm_drm_dev_init, and dropping the drm_dev_put/kfree at the bottom of the pci_remove function.
-Daniel
Quoted 43 lines
Reviewed-by Daniel Vetter <[email protected]>Quoted 35 lines
drivers/gpu/drm/ast/ast_drv.c +21
-1+if (IS_ERR (dev)) { + ret =PTR_ERR (dev); + goto err_pci_disable_device; + } + + dev->pdev = pdev; +pci_set_drvdata (pdev, dev); + + ret =drm_dev_register (dev, ent->driver_data); +if (ret) + goto err_drm_dev_put; + +return 0 ; + +err_drm_dev_put: +drm_dev_put (dev); +err_pci_disable_device: +pci_disable_device (pdev); +return ret; } static void@@ -96,7 +122,8 @@ ast_pci_remove(struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -drm_put_dev (dev); +drm_dev_unregister (dev); +drm_dev_put (dev); }static int ast_drm_freeze (struct drm_device *dev)Signature · 1 line
2.23.0Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH 2/2 drm/ast: Call struct drm_driver.{load, unload} before registering device
In reply to Thomas ZimmermannBoth callbacks are deprecated. Remove them and call functions explicitly.
--- drivers/gpu/drm/ast/ast_drv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +9 -4
@@ -104,17 +104,24 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev->pdev = pdev;pci_set_drvdata (pdev, dev); - ret =drm_dev_register (dev, ent->driver_data); + ret =ast_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_ast_driver_unload; +return 0 ; +err_ast_driver_unload: +ast_driver_unload (dev); err_drm_dev_put:drm_dev_put (dev); err_pci_disable_device:pci_disable_device (pdev);return ret; + } static void
@@ -123,6 +130,7 @@ ast_pci_remove(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);drm_dev_unregister (dev); +ast_driver_unload (dev);drm_dev_put (dev); }
@@ -228,9 +236,6 @@ static struct drm_driver driver = {DRIVER_GEM | DRIVER_MODESET, - .load = ast_driver_load, - .unload = ast_driver_unload, - .fops = &ast_fops, .name = DRIVER_NAME, .desc = DRIVER_DESC,
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm/ast: Call struct drm_driver.{load, unload} before registering device
Quoted 3 lines · Thomas Zimmermann
Both callbacks are deprecated. Remove them and call functions explicitly.
Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 55 lines
--- drivers/gpu/drm/ast/ast_drv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/gpu/drm/ast/ast_drv.c +9
-4@@ -104,17 +104,24 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev->pdev = pdev;pci_set_drvdata (pdev, dev); - ret =drm_dev_register (dev, ent->driver_data); + ret =ast_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_ast_driver_unload; +return 0 ; +err_ast_driver_unload: +ast_driver_unload (dev); err_drm_dev_put:drm_dev_put (dev); err_pci_disable_device:pci_disable_device (pdev);return ret; + } static void@@ -123,6 +130,7 @@ ast_pci_remove(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);drm_dev_unregister (dev); +ast_driver_unload (dev);drm_dev_put (dev); }@@ -228,9 +236,6 @@ static struct drm_driver driver = {DRIVER_GEM | DRIVER_MODESET, - .load = ast_driver_load, - .unload = ast_driver_unload, - .fops = &ast_fops, .name = DRIVER_NAME, .desc = DRIVER_DESC,Signature · 1 line
2.23.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel