Commit Graph

270679 Commits

Author SHA1 Message Date
yxj
08a95bd55f rk3188 lcdc:support color key config for win1 2013-02-25 14:49:58 +08:00
黄涛
cbf319ea81 rk: disable disable_nonboot_cpus when kernel restart
work around rk3188 cpu down bug temporarily.
2013-02-25 14:49:03 +08:00
Cody Xie
ed9df05d51 rk3188 ds1006h: do not use logo from customer, the sdk uses default
please config logo on your project by yourself
Revert "rk3188 ds1006h: sync logo"

This reverts commit e591148c1c.
2013-02-25 14:09:23 +08:00
hjc
e3b0ca6f27 rk3168_86v: deconfig set ddr 324M,support charge display 2013-02-25 12:44:33 +08:00
hjc
1d4445ffc3 rk3168_86v: update dvfs_gpu_table 2013-02-25 12:43:46 +08:00
hjc
e33f9d73dc rk3168m: use a useless gpio to instead of PMU_EN; set 4in1 voltage 2800->1800 2013-02-25 12:24:52 +08:00
hjc
49211a2a47 rk3168m: To backup defconfig 2013-02-25 09:49:19 +08:00
hjc
7fe6981d7d rk3168m: add board-rk3168m-tb.c 2013-02-25 09:27:30 +08:00
hjc
16fe2d5531 rk3168_86v: add maxbrightness restriction 2013-02-25 09:11:24 +08:00
yxj
0f58bab8d8 rk3188 lcdc:move RK_FBIOSET_CONFIG_DONE to rk fb 2013-02-23 17:00:24 +08:00
yxj
8d11c67753 rk fb: move ioctl RK_FBIOSET_CONFIG_DONE to rk fb 2013-02-23 17:00:24 +08:00
yxj
1dcb7bec39 rk3188 lcdc:update lcdc register in config done 2013-02-23 17:00:24 +08:00
yxj
ecb79598d3 rk fb: add some key parameter for layer_par,wirite config done when show logo 2013-02-23 17:00:23 +08:00
yxj
f7681daed3 rk fb:add config done in rk_fb_switch_screen 2013-02-23 17:00:23 +08:00
黄涛
03c2032989 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
Merge v3.0.66
Conflicts:
	Makefile
2013-02-23 16:41:10 +08:00
yzq
e2467d9d89 rk610 hdmi: fix compile err 2013-02-23 16:04:02 +08:00
yzq
80e0b8d7bb rk610 hdmi: set hdmi probe later than codec,
fix codec not close when system start with hdmi plug
2013-02-23 14:21:53 +08:00
黄涛
8db1e9f2c3 rk3066b: use rk3188 cpufreq driver 2013-02-23 13:28:40 +08:00
黄涛
890e1405c3 rk3188: cpufreq: version 2.0
thermal throttle by load
support sys_state
throttle cpu frequency when boot with low battery
2013-02-23 13:25:52 +08:00
xxx
d81ca81ce5 dvfs gets volt chngeing time for regulator 2013-02-23 11:11:42 +08:00
黄涛
eb4f115fee rk: enable synchronization framework, for support android 4.2 with mali gpu 2013-02-22 18:03:43 +08:00
Jamie Gennis
7f6da2143c sync: fix timeout = 0 wait behavior
Change-Id: I8b9254e92c26d9f44abbc0c77fb44624de947013
Signed-off-by: Jamie Gennis <jgennis@google.com>
2013-02-22 17:47:23 +08:00
Jonathan Hamilton
3ea639184b base: sync: Include seq_file.h in sync.h
sync.h uses struct seq_file in some function table prototypes. This
causes compile failures when including the header in files that do not
otherwise include seq_file.h

Signed-off-by: Jonathan Hamilton <jonathan.hamilton@imgtec.com>
2013-02-22 17:47:22 +08:00
Erik Gilling
6bb33fdfd5 sync: don't log wait timeouts when timeout = 0
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:21 +08:00
Ørjan Eide
df5c61bad0 sync: Fix race condition between merge and signal
The copied sync_pt was activated immediately. If the sync_pt was
signaled before the entire merge was completed, the new fence's pt_list
could be iterated over while it is still in the process of being
created.

Moving the the sync_pt_activate call for all new sync_pts to after both
the sync_fence_copy_pts and the sync_fence_merge_pts calls ensure that
the pt_list is complete and immutable before it can be reached from the
timeline's active list.

Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:19 +08:00
Erik Gilling
ae739c14a7 sync: add tracepoint support
Change-Id: I181326db4247009161557e45444c9b3548b83d25
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:18 +08:00
Erik Gilling
2c7ee2190a sync: refactor sync debug printing
Move driver callbacks to fill strings instead of using seq_files.  This
will allow those values to be used in a future tracepoint patch.

Change-Id: I9b706343e35b11124141fe520e520514a32003d2
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:17 +08:00
Erik Gilling
8beeb57346 sync: use proper barriers when waiting indefinitely
The previous fix only addressed waiting with a timeout.

Change-Id: I8ad735d2d0dfdd53592904e8a54f5689cb5eaa5e
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:15 +08:00
Erik Gilling
2211c10437 sync: update new fence status with sync_fence_signal_pt
If a fence's pt is signaled before sync_fence_create is called, the fence
will never transition into the signaled state.  This also address a tiny
race if a merged fence's pt after sync_fence_get_status checks it's status
and before fence->status is updated.

Change-Id: Ic8e292a323db26c6f04cb4757d920278b3125ff6
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:14 +08:00
Erik Gilling
e3ab954943 sync: protect unlocked access to fence status
Fence status is checked outside of locks in both sync_fence_wait and
sync_fence_poll.  This patch adds propper barrier protection in these
cases to avoid seeing stale status.

Change-Id: I9d8b6ce6accb415e797df58068a1ccd54e6be445
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:13 +08:00
Erik Gilling
98bcb1d21f sync: dump sync state of fence errors
Change-Id: I297a43aadf83504993040ea875c7f22d988628f1
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:11 +08:00
Erik Gilling
44adf84c6b sync: improve timeout dumps
Change-Id: I3b378d63c324c7b5862dd214f380b5e91131cc2a
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:10 +08:00
Erik Gilling
a5716d51da sync: use correct signed type when handling SYNC_IOC_WAIT
Change-Id: Ic7d5adf9b145765e52b23186b8c3c793ccf29be7
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:09 +08:00
Erik Gilling
d3a7d79571 sync: dump sync state to console on timeout
Change-Id: I74bca6b4a2afa7ed5b1f5233c5165d2edddf269a
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:08 +08:00
Erik Gilling
5d1bc19902 sync: clean up compiler warnings
Change-Id: I8a2ec5db652c61fd04571402067b37273b91e78f
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:06 +08:00
Erik Gilling
ef87732efa sync: fix erase-o in sync_fence_wait
Change-Id: I189707cf658a9f1f2943515c891b43961994e774
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:05 +08:00
Erik Gilling
c9ac59a938 sync: change wait timeout to mirror poll semantics
Change-Id: Ib38e6d339d41885a33027752690d65a52b6897f6
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:04 +08:00
Rebecca Schultz Zavin
8c83534550 sync: Fix error paths
Check the return value of get_unused_fd to make sure a valid
file descriptor is returned.

Make sure to call put_unused_fd even if an error occurs before
the fd can be used.

Change-Id: I0fe8f78d9e30ecfc4d271c5d875424543dae2d0f
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2013-02-22 17:47:02 +08:00
Erik Gilling
b84b847376 sync: add reference counting to timelines
If a timeline is destroyed while fences still hold pts on it, the reworked
fence release handler can cause the timeline to be freed before all it's points
are freed.

Change-Id: I1cd8ddb638eded7db9db446ff6b37f3dd165d6c4
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:47:01 +08:00
Erik Gilling
3162da1d18 sync: add internal refcounting to fences
If a fence is released while a timeline that one of it's pts is on is being
signaled, it is possible for that fence to be deleted before it is signaled.
This patch adds a refcount for internal references such as signaled pt
processing.

Change-Id: Ie8605e6fd2ac026c207220a03d84e1c1078ec719
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:46:59 +08:00
Erik Gilling
f7b21468ff sync: optimize fence merges
If the two fences being merged contain sync_pts from the same timeline,
those two pts will be collapsed into a single pt representing the latter
of the two.

Change-Id: Iced7ebb7e5a17a0c8b1a2969ba3388a4edb9ecaf
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:46:58 +08:00
Erik Gilling
7b6920244b sync: reorder sync_fence_release
Previously fence's pts were freed before the were the fence was removed from the
global fence list.  This led to a race with the debugfs support where it would
iterate over sync_pts that had been freed.

Change-Id: Ia3ddbf77de42ca593fc2dc353b5d04e42ddf3946
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:46:57 +08:00
Erik Gilling
4f605a26c1 sync: export sync API symbols
This is needed to allow modules to link against the sync subsystem

Change-Id: I15c1818de329f24e4113ef1d0923413b22fd0eff
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:46:56 +08:00
Erik Gilling
064f4dd519 sync: allow async waits to be canceled
In order to allow drivers to cleanly handled teardown we need to allow them
to cancel pending async waits.  To do this cleanly, we move allocation of
sync_fence_waiter to the driver calling sync_async_wait().

Change-Id: Ifcd95648be6ec07026d67f810070a4310f099989
Signed-off-by: Erik Gilling <konkers@android.com>
2013-02-22 17:46:54 +08:00
Paul Gortmaker
7b59177a62 module.h: split out the EXPORT_SYMBOL into export.h
A lot of files pull in module.h when all they are really
looking for is the basic EXPORT_SYMBOL functionality. The
recent data from Ingo[1] shows that this is one of several
instances that has a significant impact on compile times,
and it should be targeted for factoring out (as done here).

Note that several commonly used header files in include/*
directly include <linux/module.h> themselves (some 34 of them!)
The most commonly used ones of these will have to be made
independent of module.h before the full benefit of this change
can be realized.

We also transition THIS_MODULE from module.h to export.h,
since there are lots of files with subsystem structs that
in turn will have a struct module *owner and only be doing:

	.owner = THIS_MODULE;

and absolutely nothing else modular. So, we also want to have
the THIS_MODULE definition present in the lightweight header.

[1] https://lkml.org/lkml/2011/5/23/76

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-02-22 17:46:53 +08:00
hjc
2d5f6170b2 rk3168_86v: xbw:delete SDCARD_DET_FROM_GPIO 2013-02-22 16:19:32 +08:00
hjc
e3efe344cb rk3168_86v: xbw SDMMC IO voltage 2013-02-22 16:11:06 +08:00
wuhao
e591148c1c rk3188 ds1006h: sync logo 2013-02-22 16:04:56 +08:00
黄涛
83e7b770ba rk: Kconfig add RK3168M support, add SOC_RK3168M config, add RK3168M TB config 2013-02-22 15:49:18 +08:00
黄涛
37cafcd206 rk: power_supply: add rk_get_system_battery_capacity and rk_get_system_battery_status api 2013-02-22 15:10:57 +08:00