Commit Graph

29 Commits

Author SHA1 Message Date
3fecf7428d Kernel->iommu:ubuntu do not use iommu 2016-06-16 17:07:26 +08:00
54b7c620b6 Kernel->drivers: compatible with lcd 2016-05-04 14:46:46 +08:00
cjp
5820f18864 Kernel->vga:modify vga resume print win error 2016-04-05 14:27:20 +08:00
cjp
c431c2c486 Kernel->hdmi:add hdmi read edid head function 2016-03-18 18:02:47 +08:00
c105668e18 Kernel->RGB2HDMI:update rgb2hdmi resolution 2016-03-09 16:31:31 +08:00
d08de59bea [kernel] video: rockchip: lcdc: 3288: fix iommu pagefault when user set win3 dsp size bigger than act size 2016-03-08 14:18:18 +08:00
2412296b95 Kernel->RGB2HDMI:reslove RGB2HDMI set mode fail 2016-01-05 11:50:28 +08:00
9bba3e7e10 Kernel->RGB2HDMI:correct LT8618 suspend bug 2016-01-05 11:50:24 +08:00
c662241813 Kernel->rgb2hdmi ok 2016-01-05 11:49:45 +08:00
c3d506a0ec Kernel->RGB2HDMI:add rgb to hdmi support 2016-01-05 11:49:40 +08:00
81e6a558b1 Kernel->VGA: modify VGA show issue 2015-12-31 18:16:18 +08:00
8fa48dc229 kernel->lcd: increase the capacity of mipi cmds 2015-12-31 18:16:04 +08:00
cjp
445738eb02 kernel->vga:modify VGA power up launch show issue 2015-12-31 18:15:03 +08:00
djw
2b5f44213a Merge master branch.
Conflicts:
	frameworks/base/core/java/android/content/res/Configuration.java
	frameworks/base/core/java/android/provider/Settings.java
	frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/SystemBars.java
	frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
	hardware/rockchip/camera/CameraHal/CameraHal_board_xml_parse.cpp
	vendor/rockchip/common/apps/apps.mk
2015-12-31 17:54:05 +08:00
342bcc86a3 [kernel] video: rockchip: hdmi: 3288/3368: set ddc clock to 50KHz.
Change-Id: I00ba32eb9115fe63606b6ccb441ca3b7e3378880
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 9ce6f6b608392c4b3fce74146db071f23dd0f82f)
2015-12-31 16:44:14 +08:00
2665c1f437 [kernel] video: rockchip: hdmi: fix parsing 1st block edid
If parsing 1st block edid failed, we think it is good
only when there is more than one external block.

Change-Id: I1eb11405dade41ebb2ad041ba909de0c7ea120f8
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 1d9b35e9d10839a9d513eed551034fd02e855f92)
2015-12-31 16:44:05 +08:00
a04c0b97d4 [kernel] video: rockchip: display-sys: Add the same display interface device naming convention
When multiple same type display interface is registered, such as TV, named TV, TV1, TV2.

Change-Id: I33f7e12c4942c3bf7eb29cca8ef6037f9e78d1af
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit c196bbf342cdee23591522a545db6c42d9a008ea)
2015-12-31 16:43:57 +08:00
204ef22d2b [kernel] rk_fb: add extern screen open iommu, when dual screen display using iommu
Change-Id: Ia216d102df6841d4497144fe3c53aaeea9860178
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 5f6abdf11d058238fe3fc9c409eaaef7aa811d6d)
2015-12-31 16:43:49 +08:00
92b68f31f7 [kernel] video: rockchip: fb: delele obsolete code for box
There is no difference between mid and box on setting
RK_FBIOSET_CONFIG_DONE.

Change-Id: I8a454a318ad8663b5e0f94ac05c067c6b386801a
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 495b4a8232528251ee9276964014d6dd87e3ee22)
2015-12-31 16:43:41 +08:00
2618f552f3 [kernel] video: rockchip: lcdc: 3288: set iommu_status to 0, when all layer closed
Change-Id: I494c54017be89e48836870f015f420a0c148c980
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 172981dc8955170dd851910b7179710f073a7d21)
2015-12-31 16:43:33 +08:00
4a4d209d95 [kernel] video: rockchip: fb: vop driver struct select depend on lcdc id from extent screen
Change-Id: Ied1a53b86ee2e524707a017ba65cd5e648e93bae
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 662c3e55e38c83eb89f58e088bfa924b4773e17b)
2015-12-31 16:43:25 +08:00
7bdc37d437 [kernel] hdmi: hdmi_submit_work function support synchronous operation.
If hdmi_submit_work work in synchronous mode, the malloced delayed_work
is free by caller, not by hdmi_work_queue, to prevent delayed_work is
free before flush_delayed_work fucntion is executed.

Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 71a461a76455cc8b3082c0125f5d0be3287f1420)
2015-12-31 16:43:17 +08:00
13cc5557b3 [kernel] video: rockchip: fb: recalculate logo offset to match new screen size
Change-Id: I9f62088f4d0868a9284d1794718da8f5a044f24a
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit dbb4cc8d6e58a99ca90362a86603fac6464e0a09)
2015-12-31 16:42:28 +08:00
3bb7bf76b4 [kernel] video: rockchip: lcdc: 3288/3368: read screen regs in uboot mode
Change-Id: I36db50471140d041fd0220283bc4e6ce59ec9d74
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 44bc4fd73647d04771b3b0b22b2f8fc94cf259e5)
2015-12-31 16:42:20 +08:00
888311b3f5 [kernel] video: rockchip: fb: resize uboot logo if screen size is changed
If hdmi is inserted or removed before android is launched, screen
size is changed and uboot logo is showing on wrong screen position.

For example, screen size is 720x576 in uboot, hdmi is inserted during
kernel is booting, screen size is changed to 1920x1080, logo size
is still 720x576 and shown on left-top.

This case is occurred on box, mid has no problem. So we need to resize
uboot logo to new screen size.

Change-Id: I6247bf8e77d181687986815c960ec72d4c59a757
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 92e7da2818b9dd75d125d017898e30ec4f9c9ee0)
2015-12-31 16:42:12 +08:00
7d2422b2ff [kernel] video: rockchip: hdmi: introduce vic flag HDMI_UBOOT_NOT_INIT
If uboot_vic has HDMI_UBOOT_NOT_INIT flag, it means uboot just
pass the preset vic value, registers has not been set in uboot.
If not, hdmi has been power up in uboot, should not operate phy
register again.

Change-Id: I64f48bd878ec124a94f25a752a74dc9bae502b2b
Signed-off-by: Firefly <service@t-firefly.com>
(cherry picked from commit 468345a5026c858f295dedfc5644c8b63a5948c8)
2015-12-31 16:40:51 +08:00
3de097182b kernel->vga:modify complie warning 2015-08-20 10:50:42 +08:00
3f8870a135 Commit of manifest rk3288_box_lollipop_release.xml 2015-08-11 11:01:11 +08:00
93013a6efc Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml 2015-05-20 17:06:22 +08:00