drm/exynos: Suspend/resume is unused if !PM
Subsystems (3)
PATCH 1/3 drm/exynos: Suspend/resume is unused if !PM
From: Thierry Reding <[email protected]>
Protect the suspend and resume callbacks with an #ifdef CONFIG_PM_SLEEP guard to avoid "defined but not used" warnings.
--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/exynos/exynos_drm_drv.c +2 -0
@@ -304,6 +304,7 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,return 0 ; } +#ifdef CONFIG_PM_SLEEP static int exynos_drm_suspend (struct drm_device *dev,pm_message_t state) {struct drm_connector *connector;
@@ -340,6 +341,7 @@ static int exynos_drm_resume(struct drm_device *dev) return 0; } +#endif static int exynos_drm_open (struct drm_device *dev,struct drm_file *file) {
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/exynos: fimc: Clock control is unused if !PM
From: Thierry Reding <[email protected]>
Protect the fimc_clk_ctrl() function with an #ifdef CONFIG_PM guard to avoid "defined but not used" warnings.
--- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_fimc.c +18 -18
@@ -1206,23 +1206,6 @@ static struct exynos_drm_ipp_ops fimc_dst_ops = { .set_addr = fimc_dst_set_addr, }; -static int fimc_clk_ctrl (struct fimc_context *ctx,bool enable) -{ -DRM_DEBUG_KMS ("enable[%d]\n" , enable); - -if (enable) { -clk_prepare_enable (ctx->clocks[FIMC_CLK_GATE ]); -clk_prepare_enable (ctx->clocks[FIMC_CLK_WB_A ]); - ctx->suspended = false; - }else { -clk_disable_unprepare (ctx->clocks[FIMC_CLK_GATE ]); -clk_disable_unprepare (ctx->clocks[FIMC_CLK_WB_A ]); - ctx->suspended = true; - } - -return 0 ; -} -static irqreturn_t fimc_irq_handler (int irq,void *dev_id) {struct fimc_context *ctx = dev_id;
@@ -1780,6 +1763,24 @@ static int fimc_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_PM +static int fimc_clk_ctrl(struct fimc_context *ctx, bool enable) +{ + DRM_DEBUG_KMS("enable[%d]\n", enable); + + if (enable) { + clk_prepare_enable(ctx->clocks[FIMC_CLK_GATE]); + clk_prepare_enable(ctx->clocks[FIMC_CLK_WB_A]); + ctx->suspended = false; + } else { + clk_disable_unprepare(ctx->clocks[FIMC_CLK_GATE]); + clk_disable_unprepare(ctx->clocks[FIMC_CLK_WB_A]); + ctx->suspended = true; + } + + return 0; +} + #ifdef CONFIG_PM_SLEEP static int fimc_suspend(struct device *dev) {
@@ -1806,7 +1807,6 @@ static int fimc_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static int fimc_runtime_suspend (struct device *dev) {struct fimc_context *ctx =get_fimc_context (dev);
Signature · 1 line
2.5.0
Re: [PATCH 2/3] drm/exynos: fimc: Clock control is unused if !PM
Quoted 6 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Protect the
fimc_clk_ctrl()function with an #ifdefCONFIG_PMguard to avoid "defined but not used" warnings.Signed-off-by Thierry Reding <[email protected]>
Regards
Andrzej
Quoted 59 lines
--- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-)drivers/gpu/drm/exynos/exynos_drm_fimc.c +18
-17@@ -1206,23 +1206,6 @@ static struct exynos_drm_ipp_ops fimc_dst_ops = { .set_addr = fimc_dst_set_addr, }; -static int fimc_clk_ctrl (struct fimc_context *ctx,bool enable) -{ -DRM_DEBUG_KMS ("enable[%d]\n" , enable); - -if (enable) { -clk_prepare_enable (ctx->clocks[FIMC_CLK_GATE ]); -clk_prepare_enable (ctx->clocks[FIMC_CLK_WB_A ]); - ctx->suspended = false; - }else { -clk_disable_unprepare (ctx->clocks[FIMC_CLK_GATE ]); -clk_disable_unprepare (ctx->clocks[FIMC_CLK_WB_A ]); - ctx->suspended = true; - } - -return 0 ; -} -static irqreturn_t fimc_irq_handler (int irq,void *dev_id) {struct fimc_context *ctx = dev_id;@@ -1780,6 +1763,24 @@ static int fimc_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_PM +static int fimc_clk_ctrl(struct fimc_context *ctx, bool enable) +{ + DRM_DEBUG_KMS("enable[%d]\n", enable); + + if (enable) { + clk_prepare_enable(ctx->clocks[FIMC_CLK_GATE]); + clk_prepare_enable(ctx->clocks[FIMC_CLK_WB_A]); + ctx->suspended = false; + } else { + clk_disable_unprepare(ctx->clocks[FIMC_CLK_GATE]); + clk_disable_unprepare(ctx->clocks[FIMC_CLK_WB_A]); + ctx->suspended = true; + } + + return 0; +} + #ifdef CONFIG_PM_SLEEP static int fimc_suspend(struct device *dev) {
drivers/gpu/drm/exynos/exynos_drm_fimc.c static int fimc_resume(struct device *dev) · line 1812
Quoted 7 lines
drivers/gpu/drm/exynos/exynos_drm_fimc.c +0
-1@@ -1806,7 +1807,6 @@ static int fimc_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static int fimc_runtime_suspend (struct device *dev) {struct fimc_context *ctx =get_fimc_context (dev);
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/3 drm/exynos: rotator: Clock control is unused if !PM
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Protect the rotator_clk_crtl() function with an #ifdef CONFIG_PM guard to avoid "defined but not used" warnings.
--- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/exynos/exynos_drm_rotator.c +1 -1
@@ -786,6 +786,7 @@ static int rotator_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_PM static int rotator_clk_crtl (struct rot_context *rot,bool enable) {if (enable) {
@@ -822,7 +823,6 @@ static int rotator_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static int rotator_runtime_suspend (struct device *dev) {struct rot_context *rot =dev_get_drvdata (dev);
Signature · 1 line
2.5.0
Re: [PATCH 3/3] drm/exynos: rotator: Clock control is unused if !PM
Quoted 6 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Protect the
rotator_clk_crtl()function with an #ifdefCONFIG_PMguard to avoid "defined but not used" warnings.Signed-off-by Thierry Reding <[email protected]>
Quoted 25 lines
--- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/exynos/exynos_drm_rotator.c +1
-1@@ -786,6 +786,7 @@ static int rotator_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_PM static int rotator_clk_crtl (struct rot_context *rot,bool enable) {if (enable) {@@ -822,7 +823,6 @@ static int rotator_resume(struct device *dev) }#endif -#ifdef CONFIG_PM static int rotator_runtime_suspend (struct device *dev) {struct rot_context *rot =dev_get_drvdata (dev);
Quoted 6 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Protect the suspend and resume callbacks with an #ifdef
CONFIG_PM_SLEEPguard to avoid "defined but not used" warnings.Signed-off-by Thierry Reding <[email protected]>
The best solution would be to merge legacy exynos_drm_(suspend|resume) PM functions with exynos_drm_sys_(suspend|resume). There is no reason to keep both. Could you do it, if not I can prepare quick patch.
Regards
Andrzej
Quoted 18 lines
--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/exynos/exynos_drm_drv.c +1
-0@@ -304,6 +304,7 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,return 0 ; } +#ifdef CONFIG_PM_SLEEP static int exynos_drm_suspend (struct drm_device *dev,pm_message_t state) {struct drm_connector *connector;
drivers/gpu/drm/exynos/exynos_drm_drv.c static int exynos_drm_resume(struct drm_device *dev) · line 347
Quoted 7 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +1
-0@@ -340,6 +341,7 @@ static int exynos_drm_resume(struct drm_device *dev) return 0; } +#endif static int exynos_drm_open (struct drm_device *dev,struct drm_file *file) {
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel