Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

viafb: don't touch clock state on OLPC XO-1.5

Browse source 
commit 012a121184 upstream.

As detailed in the thread titled "viafb PLL/clock tweaking causes XO-1.5
instability," enabling or disabling the IGA1/IGA2 clocks causes occasional
stability problems during suspend/resume cycles on this platform.

This is rather odd, as the documentation suggests that clocks have two
states (on/off) and the default (stable) configuration is configured to
enable the clock only when it is needed. However, explicitly enabling *or*
disabling the clock triggers this system instability, suggesting that there
is a 3rd state at play here.

Leaving the clock enable/disable registers alone solves this problem.
This fixes spurious reboots during suspend/resume behaviour introduced by
commit b692a63a.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daniel Drake 2012-09-04 11:45:32 -04:00 committed by Greg Kroah-Hartman
parent a065f95a85
commit 3dca360fc8
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/video/via/via_clock.c
View file

@ -25,6 +25,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/via-core.h> #include <linux/via-core.h>
#include <asm/olpc.h>
#include "via_clock.h" #include "via_clock.h"
#include "global.h" #include "global.h"
#include "debug.h" #include "debug.h"
@ -289,6 +290,10 @@ static void dummy_set_pll(struct via_pll_config config)
printk(KERN_INFO "Using undocumented set PLL.\n%s", via_slap); printk(KERN_INFO "Using undocumented set PLL.\n%s", via_slap);
} }
static void noop_set_clock_state(u8 state)
{
}
void via_clock_init(struct via_clock *clock, int gfx_chip) void via_clock_init(struct via_clock *clock, int gfx_chip)
{ {
switch (gfx_chip) { switch (gfx_chip) {
@ -346,4 +351,18 @@ void via_clock_init(struct via_clock *clock, int gfx_chip)
break; break;
} }
if (machine_is_olpc()) {
/* The OLPC XO-1.5 cannot suspend/resume reliably if the
* IGA1/IGA2 clocks are set as on or off (memory rot
* occasionally happens during suspend under such
* configurations).
*
* The only known stable scenario is to leave this bits as-is,
* which in their default states are documented to enable the
* clock only when it is needed.
*/
clock->set_primary_clock_state = noop_set_clock_state;
clock->set_secondary_clock_state = noop_set_clock_state;
}
} }