Skip to contentSkip to conversation

Patch "drm/fsl-dcu: avoid disabling pixel clock twice on suspend" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Dec 5, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/fsl-dcu: avoid disabling pixel clock twice on suspend

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-fsl-dcu-avoid-disabling-pixel-clock-twice-on-suspend.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9306e996574f7f57136a62e49cd0075f85713623 Mon Sep 17 00:00:00 2001

From: Stefan Agner <[email protected]>
Date: Thu, 9 Nov 2017 15:39:56 +0100
Subject: drm/fsl-dcu: avoid disabling pixel clock twice on suspend

From: Stefan Agner <[email protected]>

commit 9306e996574f7f57136a62e49cd0075f85713623 upstream.

With commit 0a70c998d0c5 ("drm/fsl-dcu: enable pixel clock when enabling CRTC") the pixel clock is controlled by the CRTC code. Disabling the pixel clock in suspend leads to a warning due to the second clk_disable_unprepare call:

  WARNING: CPU: 0 PID: 359 at drivers/clk/clk.c:594 clk_core_disable+0x8c/0x90

Remove clk_disable_unprepare call for pixel clock to avoid unbalanced clock disable on suspend.

Fixes 0a70c998d0c5 ("drm/fsl-dcu: enable pixel clock when enabling CRTC")
---
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c |    1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +0 -1
@@ -243,7 +243,6 @@ static int fsl_dcu_drm_pm_suspend(struct
 		return PTR_ERR(fsl_dev->state);
 	}
 
-	clk_disable_unprepare(fsl_dev->pix_clk);
 	clk_disable_unprepare(fsl_dev->clk);
 
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/drm-fsl-dcu-avoid-disabling-pixel-clock-twice-on-suspend.patch queue-4.9/drm-fsl-dcu-enable-irq-before-drm_atomic_helper_resume.patch