Skip to content

Bigmem 326mo #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tigrouzen wants to merge 1 commit into
base: cm-10.1
Choose a base branch
from
Open

Bigmem 326mo #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions arch/arm/mach-s5pv210/mach-wave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,14 @@ static int wave_notifier_call(struct notifier_block *this,

if ((code == SYS_RESTART) && _cmd) {
if (!strcmp((char *)_cmd, "recovery"))
mode = 2; // It's not REBOOT_MODE_RECOVERY, blame Samsung
else
mode = REBOOT_MODE_NONE;
mode = 2;
else {
if (!strcmp((char *)_cmd, "bigmem"))
mode = 4;
else
if (!strcmp((char *)_cmd, ""))
mode = 0;
}
}
__raw_writel(mode, S5P_INFORM6);

Expand Down Expand Up @@ -306,6 +311,8 @@ static struct s3cfb_lcd s6e63m0 = {
};
#endif

#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_BM (0 * SZ_1K)

#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC0 (11264 * SZ_1K)
//#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC1 (5000 * SZ_1K)
#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC2 (11264 * SZ_1K)
Expand Down Expand Up @@ -4670,6 +4677,22 @@ static struct platform_device *wave_devices[] __initdata = {
&samsung_asoc_dma,
};

static void check_bigmem(void) {
int bootmode = __raw_readl(S5P_INFORM6);
if (bootmode == 4) {
wave_media_devs[2].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_BM;
wave_media_devs[4].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_BM;
wave_media_devs[0].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_BM;
wave_media_devs[1].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_BM;
}
else {
wave_media_devs[2].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC0;
wave_media_devs[4].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC2;
wave_media_devs[0].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC0;
wave_media_devs[1].memsize = S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC1;
}
}

static void __init wave_map_io(void)
{
s5p_init_io(NULL, 0, S5P_VA_CHIPID);
Expand All @@ -4679,6 +4702,7 @@ static void __init wave_map_io(void)
#ifndef CONFIG_S5P_HIGH_RES_TIMERS
s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
#endif
check_bigmem();
s5p_reserve_bootmem(wave_media_devs,
ARRAY_SIZE(wave_media_devs), S5P_RANGE_MFC);
#ifdef CONFIG_MTD_ONENAND
Expand Down