preservative: by bedalus squashed

cpufreq: rename conservative preservative and mess with it

Conflicts:
	arch/arm/configs/cyanogen_mako_defconfig
	arch/arm/mach-msm/acpuclock-8064.c

preservative: make boost logic simpler and parameterise the optimal frequency

preservative: touch boost at 1242 MHz and lower optimal fq

...and remove one fq that is barely used

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c

Revert "preservative: touch boost at 1242 MHz and lower optimal fq"

This reverts commit 0e606d3a8896ee60b04f79aa62f90420e2cd291d.

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c

preservative: touch boost at 1242 MHz and lower optimal fq (without removing the unused frequency from the clock table)

hook cpu frequency into gpu control

Conflicts:
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

GPU: be less power mad!

GPU: try to get everything updating together

Conflicts:
	arch/arm/Kconfig
	arch/arm/configs/cyanogen_mako_defconfig
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

CPU and GPU tweaks for new 1.7GHz limit

preservative: add iowait discount

Revert "preservative: add iowait discount"

This reverts commit 13817fd287456eae881fbbfbf528b3f0d982ddb7.

preservative: make fq stay above 1134MHz to keep the bus speed high, add hysteresis to prevent spurius scaling below this point

Conflicts:
	arch/arm/mach-msm/msm_hotplug.c

preservative: allow 702MHz sleep and bring higher bus speeds down to 810MHz

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c

preservative: bring back all frequencies, no need to skip any as everything is solved in the clock tables now

preservative: change behaviour when asleep.

Get an early suspend hook from the hotplug driver to allow for
a drop the optimal frequency position. Drop opt_pos down to a level
where the bus speed is normal. Restore it when the device wakes (my
kernel uses mainly max bus speed when the device is not idle).

Allow scaling up to any fq even when asleep to ensure the dialer
app loads quickly.

Prevent touch events from boosting the fq when asleep.

Conflicts:
	arch/arm/mach-msm/msm_hotplug.c
	include/linux/cpufreq.h

experimental tweaks to idle fq; hotplug; preservative

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c

preservative: adjust scaling due to new low idle fq

preservative: change behaviour when asleep.

Get an early suspend hook from the hotplug driver to allow for
a drop the optimal frequency position. Drop opt_pos down to a level
where the bus speed is normal. Restore it when the device wakes (my
kernel uses mainly max bus speed when the device is not idle).

Allow scaling up to any fq even when asleep to ensure the dialer
app loads quickly.

Prevent touch events from boosting the fq when asleep.

Conflicts:
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c
	include/linux/cpufreq.h

experimental tweaks to idle fq; hotplug; preservative

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/cpufreq/cpufreq_preservative.c

preservative: adjust scaling due to new low idle fq

preservative: tidy up and increase rate

revert experimental changes

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_hotplug.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

preservative: hook into GPU and bump optimum fq. to 810 MHz again

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c

Add 189 MHz

Remove go-opt
intelli-plug: Extern early_suspended
Add CPU_FREQ_GOV_PRESERVATIVE
msm: kgsl: by franciscofranco squashed

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
ARM: msm: remove clock-debug

This is only used for development and testing, remove it.
--mrg666

Conflicts:
	arch/arm/mach-msm/Makefile

ARM: msm: disable nohlt debugfs node

Conflicts:
	arch/arm/mach-msm/Makefile

ARM: msm: disable MSM_SMD_LOGGING

also modify Makefile so that smd_rpc_sym.c is only compiled when
MSM_SMD_LOGGING enabled since it is only needed by smem_log.c
--mrg666

Conflicts:
	arch/arm/configs/mako_config
msm: kgsl: Protect against a potential overflow in kgsl_sg_alloc

Avoid allocating a scatterlist so large that it overflows the size
passed to the memory allocators.

CRs-fixed: 564448
Change-Id: Ic0dedbad2ab421ddec8f3be38d61c9bdf9ae5bd4
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

msm: kgsl: Add check for NULL value from dev_get_drvdata

Check to see if dev_get_drvdata returns NULL and handle it.

CRs-Fixed: 552580
Change-Id: Ic0dedbad426dbbe15896608213067ee7337f3b34
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

msm: kgsl: Restrict the maximum memory entries for bulk cache sync

Restrict the maximum number of memory entries that can be specified
to a single bulk cache sync call to PAGE_SIZE / sizeof(unsigned int)
so that the allocation can always fit within one page.

CRs-fixed: 578062
Change-Id: Ic0dedbad07e1986cd6ccc5b260ffef82b5adb6d3
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

msm: kgsl: Fix mem leak when page allocation fails

Page allocation may fail during OOM condition. Update
sglen and size to correct value (allocated) so that
they get freed in kgsl_sharedmem_free().

Change-Id: I1aa0ca77bb767523dfcf0f6cc3a21eac2b6b80e4
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>