drm/komeda: Reordered the komeda's de-init functions
Subsystems (4)
PATCH v2 1/1 drm/komeda: Reordered the komeda's de-init functions
From: Ayan Halder <[email protected]>
The de-init routine should be doing the following in order:-
1. Unregister the drm device
2. Shut down the crtcs - failing to do this might cause a connector leakage See the 'commit 109c4d18e574 ("drm/arm/malidp: Ensure that the crtcs are shutdown before removing any encoder/connector")'
3. Disable the interrupts
4. Unbind the components
5. Free up DRM mode_config info
Changes from v1:-
1. Re-ordered the header files inclusion
2. Rebased on top of the latest drm-misc-fixes
--- .../gpu/drm/arm/display/komeda/komeda_kms.c | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +15 -8
@@ -14,8 +14,8 @@#include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_irq.h> -#include <drm/drm_vblank.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "komeda_dev.h" #include "komeda_framebuffer.h"
@@ -306,11 +306,11 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) komeda_kms_irq_handler,IRQF_SHARED , drm->driver->name, drm);if (err) - goto cleanup_mode_config; + goto free_component_binding; err = mdev->funcs->enable_irq (mdev);if (err) - goto cleanup_mode_config; + goto free_component_binding; drm->irq_enabled = true;
@@ -318,15 +318,21 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) err =drm_dev_register (drm,0 );if (err) - goto cleanup_mode_config; + goto free_interrupts;return kms; -cleanup_mode_config: +free_interrupts:drm_kms_helper_poll_fini (drm); drm->irq_enabled = false; + mdev->funcs->disable_irq (mdev); +free_component_binding: +component_unbind_all (mdev->dev, drm); +cleanup_mode_config:drm_mode_config_cleanup (drm);komeda_kms_cleanup_private_objs (kms); + drm->dev_private =NULL ; +drm_dev_put (drm); free_kms:kfree (kms);return ERR_PTR (err);
@@ -337,13 +343,14 @@ void komeda_kms_detach(struct komeda_kms_dev *kms)struct drm_device *drm = &kms->base;struct komeda_dev *mdev = drm->dev_private; - drm->irq_enabled = false; - mdev->funcs->disable_irq (mdev);drm_dev_unregister (drm);drm_kms_helper_poll_fini (drm); +drm_atomic_helper_shutdown (drm); + drm->irq_enabled = false; + mdev->funcs->disable_irq (mdev);component_unbind_all (mdev->dev, drm); -komeda_kms_cleanup_private_objs (kms);drm_mode_config_cleanup (drm); +komeda_kms_cleanup_private_objs (kms); drm->dev_private =NULL ;drm_dev_put (drm); }
Signature · 1 line
2.21.0
Quoted 11 lines · Ayan Halder
From: Ayan Halder <[email protected]>
The de-init routine should be doing the following in order:-
1. Unregister the drm device
2. Shut down the crtcs - failing to do this might cause a connector leakage See the 'commit109c4d18e574("drm/arm/malidp: Ensure that the crtcs are shutdown before removing any encoder/connector")'
3. Disable the interrupts
4. Unbind the components
5. Free up DRMmode_configinfo
Quoted 6 lines
Changes from v1:-
1. Re-ordered the header files inclusion
2. Rebased on top of the latest drm-misc-fixesSigned-off-by Ayan Kumar Halder <[email protected]>Reviewed-by Mihail Atanassov <[email protected]>
Looks good to me.
Quoted 76 lines
--- .../gpu/drm/arm/display/komeda/komeda_kms.c | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_kms.c +15
-8@@ -14,8 +14,8 @@#include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_irq.h> -#include <drm/drm_vblank.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "komeda_dev.h" #include "komeda_framebuffer.h" @@ -306,11 +306,11 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) komeda_kms_irq_handler,IRQF_SHARED , drm->driver->name, drm);if (err) - goto cleanup_mode_config; + goto free_component_binding; err = mdev->funcs->enable_irq (mdev);if (err) - goto cleanup_mode_config; + goto free_component_binding; drm->irq_enabled = true;@@ -318,15 +318,21 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) err =drm_dev_register (drm,0 );if (err) - goto cleanup_mode_config; + goto free_interrupts;return kms; -cleanup_mode_config: +free_interrupts:drm_kms_helper_poll_fini (drm); drm->irq_enabled = false; + mdev->funcs->disable_irq (mdev); +free_component_binding: +component_unbind_all (mdev->dev, drm); +cleanup_mode_config:drm_mode_config_cleanup (drm);komeda_kms_cleanup_private_objs (kms); + drm->dev_private =NULL ; +drm_dev_put (drm); free_kms:kfree (kms);return ERR_PTR (err);@@ -337,13 +343,14 @@ void komeda_kms_detach(struct komeda_kms_dev *kms)struct drm_device *drm = &kms->base;struct komeda_dev *mdev = drm->dev_private; - drm->irq_enabled = false; - mdev->funcs->disable_irq (mdev);drm_dev_unregister (drm);drm_kms_helper_poll_fini (drm); +drm_atomic_helper_shutdown (drm); + drm->irq_enabled = false; + mdev->funcs->disable_irq (mdev);component_unbind_all (mdev->dev, drm); -komeda_kms_cleanup_private_objs (kms);drm_mode_config_cleanup (drm); +komeda_kms_cleanup_private_objs (kms); drm->dev_private =NULL ;drm_dev_put (drm); }Signature · 1 line
2.21.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Ayan Halder
AppliedQuoted 16 lines · james qian wang (Arm Technology China)
Quoted 15 lines · Ayan Halder
From: Ayan Halder <[email protected]>
The de-init routine should be doing the following in order:-
1. Unregister the drm device
2. Shut down the crtcs - failing to do this might cause a connector leakage See the 'commit109c4d18e574("drm/arm/malidp: Ensure that the crtcs are shutdown before removing any encoder/connector")'
3. Disable the interrupts
4. Unbind the components
5. Free up DRMmode_configinfoChanges from v1:-
1. Re-ordered the header files inclusion
2. Rebased on top of the latest drm-misc-fixes
Quoted 7 lines
Quoted 2 lines
Signed-off-by Ayan Kumar Halder <[email protected]>Reviewed-by Mihail Atanassov <[email protected]>Looks good to me.
Pushed to drm-misc-fixes - 6978bce054247e4cfccdf689ce263e076499f905
Quoted 60 lines
Quoted 60 lines
--- .../gpu/drm/arm/display/komeda/komeda_kms.c | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_kms.c +11
-5@@ -14,8 +14,8 @@#include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_irq.h> -#include <drm/drm_vblank.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "komeda_dev.h" #include "komeda_framebuffer.h" @@ -306,11 +306,11 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) komeda_kms_irq_handler,IRQF_SHARED , drm->driver->name, drm);if (err) - goto cleanup_mode_config; + goto free_component_binding; err = mdev->funcs->enable_irq (mdev);if (err) - goto cleanup_mode_config; + goto free_component_binding; drm->irq_enabled = true;@@ -318,15 +318,21 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) err =drm_dev_register (drm,0 );if (err) - goto cleanup_mode_config; + goto free_interrupts;return kms; -cleanup_mode_config: +free_interrupts:drm_kms_helper_poll_fini (drm); drm->irq_enabled = false; + mdev->funcs->disable_irq (mdev); +free_component_binding: +component_unbind_all (mdev->dev, drm); +cleanup_mode_config:drm_mode_config_cleanup (drm);komeda_kms_cleanup_private_objs (kms); + drm->dev_private =NULL ; +drm_dev_put (drm); free_kms:kfree (kms);return ERR_PTR (err);@@ -337,13 +343,14 @@ void komeda_kms_detach(struct komeda_kms_dev *kms)struct drm_device *drm = &kms->base;struct komeda_dev *mdev = drm->dev_private;
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +4
-3- drm->irq_enabled = false; - mdev->funcs->disable_irq (mdev);drm_dev_unregister (drm);drm_kms_helper_poll_fini (drm); +drm_atomic_helper_shutdown (drm); + drm->irq_enabled = false; + mdev->funcs->disable_irq (mdev);component_unbind_all (mdev->dev, drm); -komeda_kms_cleanup_private_objs (kms);drm_mode_config_cleanup (drm); +komeda_kms_cleanup_private_objs (kms); drm->dev_private =NULL ;drm_dev_put (drm); }Signature · 1 line
2.21.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel