drm/komeda: Adds power management support
Subsystems (4)
PATCH 1/1 drm/komeda: Adds power management support
Adds runtime and system power management support in KMS kernel driver.
Depends on:
- https://patchwork.freedesktop.org/series/61650/
- https://patchwork.freedesktop.org/series/60083/
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 30 +++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 54 ++++++++++++++++++++++-- 4 files changed, 85 insertions(+), 3 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2 -0
@@ -257,6 +257,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc, komeda_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old) { + pm_runtime_get_sync(crtc->dev->dev);komeda_crtc_prepare (to_kcrtc (crtc));drm_crtc_vblank_on (crtc);komeda_crtc_do_flush (crtc, old);
@@ -330,6 +331,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,drm_crtc_vblank_off (crtc);komeda_crtc_unprepare (kcrtc); +pm_runtime_put (crtc->dev->dev); } static void
drivers/gpu/drm/arm/display/komeda/komeda_dev.c +30 -0
@@ -308,3 +308,33 @@ void komeda_dev_destroy(struct komeda_dev *mdev)devm_kfree (dev, mdev); } + +int komeda_dev_resume (struct komeda_dev *mdev) +{ +int ret =0 ; + +if (mdev->iommu && mdev->funcs->connect_iommu) { + ret = mdev->funcs->connect_iommu (mdev); +if (ret <0 ) { +DRM_ERROR ("connect iommu failed.\n" ); +return ret; + } + } + +return mdev->funcs->enable_irq (mdev); +} + +int komeda_dev_suspend (struct komeda_dev *mdev) +{ +int ret =0 ; + +if (mdev->iommu && mdev->funcs->disconnect_iommu) { + ret = mdev->funcs->disconnect_iommu (mdev); +if (ret <0 ) { +DRM_ERROR ("disconnect iommu failed.\n" ); +return ret; + } + } + +return mdev->funcs->disable_irq (mdev); +}
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +2 -0
@@ -207,4 +207,6 @@ struct komeda_dev {struct komeda_dev *dev_to_mdev (struct device *dev); +int komeda_dev_resume (struct komeda_dev *mdev); +int komeda_dev_suspend (struct komeda_dev *mdev);#endif /*_KOMEDA_DEV_H_*/
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +51 -3
93 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Liviu Dudau
maintainerHi Lowry,
Quoted 133 lines · Lowry Li (Arm Technology China)
Adds runtime and system power management support in KMS kernel driver.
Depends on:
- https://patchwork.freedesktop.org/series/61650/
- https://patchwork.freedesktop.org/series/60083/Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 30 +++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 54 ++++++++++++++++++++++-- 4 files changed, 85 insertions(+), 3 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-0@@ -257,6 +257,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc, komeda_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old) { + pm_runtime_get_sync(crtc->dev->dev);komeda_crtc_prepare (to_kcrtc (crtc));drm_crtc_vblank_on (crtc);komeda_crtc_do_flush (crtc, old);@@ -330,6 +331,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,drm_crtc_vblank_off (crtc);komeda_crtc_unprepare (kcrtc); +pm_runtime_put (crtc->dev->dev); } static voiddrivers/gpu/drm/arm/display/komeda/komeda_dev.c +30
-0@@ -308,3 +308,33 @@ void komeda_dev_destroy(struct komeda_dev *mdev)devm_kfree (dev, mdev); } + +int komeda_dev_resume (struct komeda_dev *mdev) +{ +int ret =0 ; + +if (mdev->iommu && mdev->funcs->connect_iommu) { + ret = mdev->funcs->connect_iommu (mdev); +if (ret <0 ) { +DRM_ERROR ("connect iommu failed.\n" ); +return ret; + } + } + +return mdev->funcs->enable_irq (mdev); +} + +int komeda_dev_suspend (struct komeda_dev *mdev) +{ +int ret =0 ; + +if (mdev->iommu && mdev->funcs->disconnect_iommu) { + ret = mdev->funcs->disconnect_iommu (mdev); +if (ret <0 ) { +DRM_ERROR ("disconnect iommu failed.\n" ); +return ret; + } + } + +return mdev->funcs->disable_irq (mdev); +}drivers/gpu/drm/arm/display/komeda/komeda_dev.h +2
-0@@ -207,4 +207,6 @@ struct komeda_dev {struct komeda_dev *dev_to_mdev (struct device *dev); +int komeda_dev_resume (struct komeda_dev *mdev); +int komeda_dev_suspend (struct komeda_dev *mdev);#endif /*_KOMEDA_DEV_H_*/ drivers/gpu/drm/arm/display/komeda/komeda_drv.c +9
-2@@ -8,6 +8,7 @@#include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/component.h> +#include <linux/pm_runtime.h> #include <drm/drm_of.h> #include "komeda_dev.h" #include "komeda_kms.h" @@ -32,6 +33,9 @@ static void komeda_unbind(struct device *dev)return ;komeda_kms_detach (mdrv->kms); + +pm_runtime_disable (dev); +komeda_dev_destroy (mdrv->mdev);dev_set_drvdata (dev,NULL );@@ -52,6 +56,9 @@ static int komeda_bind(struct device *dev) err =PTR_ERR (mdrv->mdev); goto free_mdrv; } +dev_set_drvdata (dev, mdrv); + +pm_runtime_enable (dev); mdrv->kms =komeda_kms_attach (mdrv->mdev);if (IS_ERR (mdrv->kms)) {@@ -59,11 +66,10 @@ static int komeda_bind(struct device *dev) goto destroy_mdev; } -dev_set_drvdata (dev, mdrv); -return 0 ; destroy_mdev: +pm_runtime_disable (dev);komeda_dev_destroy (mdrv->mdev); free_mdrv:@@ -134,13 +140,55 @@ static int komeda_platform_remove(struct platform_device *pdev)MODULE_DEVICE_TABLE (of, komeda_of_match); +static int komeda_rt_pm_suspend (struct device *dev)
drivers/gpu/drm/arm/display/komeda/komeda_drv.c static int komeda_platform_remove(struct platform_device *pdev) · line 153
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +10
-0+{ +dev_info (dev,"%s\n" , __func__); +return 0 ; +} + +static int komeda_rt_pm_resume (struct device *dev) +{ +dev_info (dev,"%s\n" , __func__); +return 0 ; +}
Useful only for debugging? I think you've missed an opportunity here to turn off clocks and disable interrupts.
Quoted 11 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +11
-0+ +static int __maybe_unused komeda_pm_suspend (struct device *dev) +{ +struct komeda_drv *mdrv =dev_get_drvdata (dev); +struct drm_device *drm = &mdrv->kms->base; +int res; + +dev_info (dev,"%s\n" , __func__); + res =drm_mode_config_helper_suspend (drm); + +komeda_dev_suspend (mdrv->mdev);
drivers/gpu/drm/arm/display/komeda/komeda_drv.c static int komeda_platform_remove(struct platform_device *pdev) · line 174
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +10
-0+ +return res; +} + +static int __maybe_unused komeda_pm_resume (struct device *dev) +{ +struct komeda_drv *mdrv =dev_get_drvdata (dev); +struct drm_device *drm = &mdrv->kms->base; + +dev_info (dev,"%s\n" , __func__);
I don't see the point of printing all these message on suspend/resume. Please convert them to DRM_DEBUG() if you want to have some sort of notices in the kernel log, otherwise please remove them.
Best regards,
Liviu
Quoted 24 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +11
-1+komeda_dev_resume (mdrv->mdev); + +return drm_mode_config_helper_resume (drm); +} + +static const struct dev_pm_ops komeda_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(komeda_pm_suspend, komeda_pm_resume) +SET_RUNTIME_PM_OPS (komeda_rt_pm_suspend, komeda_rt_pm_resume,NULL ) +}; +static struct platform_driver komeda_platform_driver = { .probe = komeda_platform_probe, .remove = komeda_platform_remove, .driver = { .name ="komeda" , .of_match_table = komeda_of_match, - .pm =NULL , + .pm = &komeda_pm_ops, }, };Signature · 1 line
1.9.1
Signature · 8 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯Hi Liviu,
Quoted 135 lines · Liviu Dudau
Hi Lowry,
Quoted 132 lines · Lowry Li (Arm Technology China)
Adds runtime and system power management support in KMS kernel driver.
Depends on:
- https://patchwork.freedesktop.org/series/61650/
- https://patchwork.freedesktop.org/series/60083/Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 30 +++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 54 ++++++++++++++++++++++-- 4 files changed, 85 insertions(+), 3 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-0@@ -257,6 +257,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc, komeda_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old) { + pm_runtime_get_sync(crtc->dev->dev);komeda_crtc_prepare (to_kcrtc (crtc));drm_crtc_vblank_on (crtc);komeda_crtc_do_flush (crtc, old);@@ -330,6 +331,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,drm_crtc_vblank_off (crtc);komeda_crtc_unprepare (kcrtc); +pm_runtime_put (crtc->dev->dev); } static voiddrivers/gpu/drm/arm/display/komeda/komeda_dev.c +30
-0@@ -308,3 +308,33 @@ void komeda_dev_destroy(struct komeda_dev *mdev)devm_kfree (dev, mdev); } + +int komeda_dev_resume (struct komeda_dev *mdev) +{ +int ret =0 ; + +if (mdev->iommu && mdev->funcs->connect_iommu) { + ret = mdev->funcs->connect_iommu (mdev); +if (ret <0 ) { +DRM_ERROR ("connect iommu failed.\n" ); +return ret; + } + } + +return mdev->funcs->enable_irq (mdev); +} + +int komeda_dev_suspend (struct komeda_dev *mdev) +{ +int ret =0 ; + +if (mdev->iommu && mdev->funcs->disconnect_iommu) { + ret = mdev->funcs->disconnect_iommu (mdev); +if (ret <0 ) { +DRM_ERROR ("disconnect iommu failed.\n" ); +return ret; + } + } + +return mdev->funcs->disable_irq (mdev); +}drivers/gpu/drm/arm/display/komeda/komeda_dev.h +2
-0@@ -207,4 +207,6 @@ struct komeda_dev {struct komeda_dev *dev_to_mdev (struct device *dev); +int komeda_dev_resume (struct komeda_dev *mdev); +int komeda_dev_suspend (struct komeda_dev *mdev);#endif /*_KOMEDA_DEV_H_*/ drivers/gpu/drm/arm/display/komeda/komeda_drv.c +8
-2@@ -8,6 +8,7 @@#include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/component.h> +#include <linux/pm_runtime.h> #include <drm/drm_of.h> #include "komeda_dev.h" #include "komeda_kms.h" @@ -32,6 +33,9 @@ static void komeda_unbind(struct device *dev)return ;komeda_kms_detach (mdrv->kms); + +pm_runtime_disable (dev); +komeda_dev_destroy (mdrv->mdev);dev_set_drvdata (dev,NULL );@@ -52,6 +56,9 @@ static int komeda_bind(struct device *dev) err =PTR_ERR (mdrv->mdev); goto free_mdrv; } +dev_set_drvdata (dev, mdrv); + +pm_runtime_enable (dev); mdrv->kms =komeda_kms_attach (mdrv->mdev);if (IS_ERR (mdrv->kms)) {@@ -59,11 +66,10 @@ static int komeda_bind(struct device *dev) goto destroy_mdev; } -dev_set_drvdata (dev, mdrv); -return 0 ; destroy_mdev: +pm_runtime_disable (dev);komeda_dev_destroy (mdrv->mdev); free_mdrv:@@ -134,13 +140,55 @@ static int komeda_platform_remove(struct platform_device *pdev)MODULE_DEVICE_TABLE (of, komeda_of_match);
Quoted 15 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c static int komeda_platform_remove(struct platform_device *pdev) · line 153
Quoted 11 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +11
-0+static int komeda_rt_pm_suspend (struct device *dev) +{ +dev_info (dev,"%s\n" , __func__); +return 0 ; +} + +static int komeda_rt_pm_resume (struct device *dev) +{ +dev_info (dev,"%s\n" , __func__); +return 0 ; +}Useful only for debugging? I think you've missed an opportunity here to turn off clocks and disable interrupts.
Since we have unified mclk/pclk/pipeline->aclk to one mclk, which will be turned on/off when crtc atomic enable/disable, no need to do those here. So runtime pm resume and suspend will be removed.
Quoted 26 lines
Quoted 11 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +11
-0+ +static int __maybe_unused komeda_pm_suspend (struct device *dev) +{ +struct komeda_drv *mdrv =dev_get_drvdata (dev); +struct drm_device *drm = &mdrv->kms->base; +int res; + +dev_info (dev,"%s\n" , __func__); + res =drm_mode_config_helper_suspend (drm); + +komeda_dev_suspend (mdrv->mdev);drivers/gpu/drm/arm/display/komeda/komeda_drv.c static int komeda_platform_remove(struct platform_device *pdev) · line 174
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +10
-0+ +return res; +} + +static int __maybe_unused komeda_pm_resume (struct device *dev) +{ +struct komeda_drv *mdrv =dev_get_drvdata (dev); +struct drm_device *drm = &mdrv->kms->base; + +dev_info (dev,"%s\n" , __func__);I don't see the point of printing all these message on suspend/resume. Please convert them to
DRM_DEBUG()if you want to have some sort of notices in the kernel log, otherwise please remove them.
Quoted 2 lines
Best regards,
Liviu
Yes, will remove them. Thanks a lot.
Best regards,
Lowry
Quoted 35 lines
Quoted 25 lines
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +11
-1+komeda_dev_resume (mdrv->mdev); + +return drm_mode_config_helper_resume (drm); +} + +static const struct dev_pm_ops komeda_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(komeda_pm_suspend, komeda_pm_resume) +SET_RUNTIME_PM_OPS (komeda_rt_pm_suspend, komeda_rt_pm_resume,NULL ) +}; +static struct platform_driver komeda_platform_driver = { .probe = komeda_platform_probe, .remove = komeda_platform_remove, .driver = { .name ="komeda" , .of_match_table = komeda_of_match, - .pm =NULL , + .pm = &komeda_pm_ops, }, };Signature · 1 line
1.9.1Signature · 8 lines
==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯
Signature · 6 lines
Regards, Lowry _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel