From f1ad90da5c0fcb8841cc5e6d66c56f4005d8c960 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 11 Jul 2011 11:05:49 +0200 Subject: fbdev: sh_mobile_lcdc: Turn dot clock on before resuming from runtime PM Resuming from runtime PM restores all LCDC registers. If the dot clock is off at that time display panning information will be corrupted. Turn the dot clock on before resuming from runtime PM. Similarly, turn the clock off after suspending the LCDC. Signed-off-by: Laurent Pinchart Tested-by: Guennadi Liakhovetski --- drivers/video/sh_mobile_lcdcfb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/video/sh_mobile_lcdcfb.c') diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 2f921ad18559..913515908c52 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -256,9 +256,9 @@ struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = { static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv) { if (atomic_inc_and_test(&priv->hw_usecnt)) { - pm_runtime_get_sync(priv->dev); if (priv->dot_clk) clk_enable(priv->dot_clk); + pm_runtime_get_sync(priv->dev); if (priv->meram_dev && priv->meram_dev->pdev) pm_runtime_get_sync(&priv->meram_dev->pdev->dev); } @@ -267,11 +267,11 @@ static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv) static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) { if (atomic_sub_return(1, &priv->hw_usecnt) == -1) { - if (priv->dot_clk) - clk_disable(priv->dot_clk); if (priv->meram_dev && priv->meram_dev->pdev) pm_runtime_put_sync(&priv->meram_dev->pdev->dev); pm_runtime_put(priv->dev); + if (priv->dot_clk) + clk_disable(priv->dot_clk); } } -- cgit v1.2.3 .8 Unnamed repository; edit this file to name it for gitweb.root
summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-04-10update translations for 4.1.6 rc1libreoffice-4-1Christian Lohmaier774-13199/+34560
2014-01-14update translations for 4.1.5 rc1Christian Lohmaier304-3158/+2960
2013-11-26update translations for 4.1.4 RC1Christian Lohmaier1483-22274/+69483
2013-11-12decimal comma for huAndras Timar1-1/+1
2013-11-05wrong titleAndras Timar1-2/+2
2013-11-04updated Slovenian translationMartin Srebotnjak28-131/+794
2013-10-08update translations for 4.1.3rc1cp-4.1-branch-pointcp-4.1-2cp-4.1-1Christian Lohmaier1199-16548/+252087
2013-09-02pocheck kills translation errorsAndras Timar125-5524/+437
2013-09-02update translations for LibreOffice 4.1.2 rc1Andras Timar292-3010/+3073
2013-08-28Resolves: rhbz#1000692 mistranslation in de if opening Format->AbsatzCaolán McNamara1-1/+1
2013-08-28translation updates and bugfixesAndras Timar882-3667/+2444
2013-08-26translation updates and bugfixesAndras Timar301-3317/+3002
2013-08-20last minute updates and pocheck fixes for 4.1.1 rc2Andras Timar117-1422/+992
2013-08-18update translations for LibreOffice 4.1.1 rc2Andras Timar946-25048/+20345
2013-08-06update translations for LibreOffice 4.1.1 rc1Andras Timar3266-50365/+422307
2013-07-25fdo#67093 Change traduction of Header in it to avoid conflict with HeadingArnaud Versini1-1/+1
2013-07-23fdo#67093 Change traduction of Title for some more languagesChristian Lohmaier13-13/+13
2013-07-20fdo#67093 Change traduction of Title in french to avoid conflict with HeadingArnaud Versini1-1/+1
2013-07-15forgot add theseAndras Timar2-0/+44
2013-07-15update translations for LibreOffice 4.1 rc3Andras Timar2846-53972/+61272
2013-07-03fdo#66007 - spurious & causing entity warning errorsChristian Lohmaier1-4/+4
2013-06-30update translations for LibreOffice 4.1 rc2Andras Timar8537-97910/+246464
2013-06-24parser error : EntityRef: expectingCaolán McNamara1-4/+4
2013-06-23Updated Slovenian translationAndras Timar22-65/+283
2013-06-21invalid xmlAndras Timar1-1/+1
2013-06-21update Sidama translationAndras Timar306-22257/+25925
2013-06-18buildfixAndras Timar1-1/+1
2013-06-18update translations for LibreOffice 4.1 rc1Andras Timar3938-72954/+79793
2013-06-15typo/help l10n extraction errorAndras Timar57-121/+121
2013-06-12fdo#65512 fix missing imagesAndras Timar342-973/+973
2013-06-12updated Slovenian translationAndras Timar32-289/+193
2013-06-12missing | cause Windows installer error 2870Andras Timar10-22/+22
2013-06-11fdo#65214 missing | cause Windows installer error 2870Andras Timar1-1/+1
2013-06-11fdo#65483 fix po filesAndras Timar614-139655/+6394
2013-06-05update translations for LibreOffice 4.1 beta2Andras Timar351-3667/+4053
2013-06-03update translations for LibreOffice 4.1 beta2Andras Timar