Commit Graph

404987 Commits

Author SHA1 Message Date
Huang, Tao
d02dc548d4 cpufreq: rockchip_big_little: check cpufreq_cpu_get return value
fix panic when cpu up/down

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-04-29 09:05:09 +08:00
Zheng Yang
61d46c90ee HDMI: rk3368: add function for HDCP2.2.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-04-28 19:17:27 +08:00
Mark Yao
5f3c54f3cb rockchip: video: fix logo display when switch screen
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-04-28 14:56:16 +08:00
Mark Yao
0f344c95ce Revert "video: rockchip: logo: copy loader to framebuffer"
This reverts commit a9085919ca.
2015-04-28 14:54:41 +08:00
Mark Yao
ab3d3ee03b Revert "video: dts: add disp fullscreen for box logo"
This reverts commit b8667979fa.
2015-04-28 14:54:41 +08:00
smj
544790e030 rk3368: add the hdmi nlpcm and hbr mode for direct output
Signed-off-by: smj <smj@rock-chips.com>
2015-04-27 19:39:15 +08:00
Zheng Yang
c84a187216 dts: delete node rockchips,hdmi_audio_source.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-04-27 17:01:48 +08:00
Mark Yao
bff29ceb63 video: rockchip: update display buffer dump
Create a new sys node "/sys/class/graphics/fb0/dump_buf" to dump
display buffer.

Now can support trace multi frames and kernel logo dump.
More info see by "cat /sys/class/graphics/fb0/dump_buf"

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

Conflicts:
	include/linux/rk_fb.h
2015-04-27 09:38:21 +08:00
hjc
5a1141f969 delete unused file drivers/video/rockchip/rk_fb.c.rej
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-26 16:45:14 +08:00
Sugar Zhang
8c5cdaefbe sofia3gr: ion: fix this issue, the reason is ion_import_dma_buf may be invoked concurrently.
<4>[ 3123.242655] WARNING: CPU: 2 PID: 2648 at drivers/staging/android/ion/ion.c:512 ion_handle_add+0xb4/0xc0()
<7>[ 3123.252189] ion_handle_add: buffer already found.
<7>[ 3123.256694] Modules linked in: iwlmvm iwlwifi mac80211 cfg80211 compat
<7>[ 3123.263195] CPU: 2 PID: 2648 Comm: TimedEventQueue Tainted: G        W    3.14.0 #7
<7>[ 3123.270868]  00000000 00000000 9a3efd2c 80faf273 9a3efd6c 9a3efd5c 80935dc9 811d7fd3
<7>[ 3123.278405]  9a3efd88 00000a58 812208a0 00000200 80e128d4 80e128d4 8d4ae00c a8cd8600
<7>[ 3123.286065]  a8cd8094 9a3efd74 80935e0e 00000009 9a3efd6c 811d7fd3 9a3efd88 9a3efd9c
<7>[ 3123.293867] Call Trace:
<7>[ 3123.296159]  [<80faf273>] dump_stack+0x48/0x69
<7>[ 3123.300537]  [<80935dc9>] warn_slowpath_common+0x79/0x90
<7>[ 3123.305913]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.310694]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.315703]  [<80935e0e>] warn_slowpath_fmt+0x2e/0x30
<7>[ 3123.320586]  [<80e128d4>] ion_handle_add+0xb4/0xc0
<7>[ 3123.325450]  [<80e144cc>] ion_import_dma_buf+0x8c/0x110
<7>[ 3123.330490]  [<80c517c4>] reg_init+0x364/0x7d0
<7>[ 3123.334975]  [<80993363>] ? futex_wait+0x123/0x210
<7>[ 3123.339607]  [<80992e0e>] ? get_futex_key+0x16e/0x1e0
<7>[ 3123.344692]  [<8099308f>] ? futex_wake+0x5f/0x120
<7>[ 3123.349245]  [<80c51e19>] vpu_service_ioctl+0x1e9/0x500
<7>[ 3123.354508]  [<80994aec>] ? do_futex+0xec/0x8e0
<7>[ 3123.358885]  [<80971080>] ? prepare_to_wait_event+0xc0/0xc0
<7>[ 3123.364503]  [<80c51c30>] ? reg_init+0x7d0/0x7d0
<7>[ 3123.368955]  [<80a22562>] do_vfs_ioctl+0x2d2/0x4c0
<7>[ 3123.373816]  [<80b198ad>] ? inode_has_perm.isra.41+0x2d/0x40
<7>[ 3123.379278]  [<80b199cf>] ? file_has_perm+0x7f/0x90
<7>[ 3123.384217]  [<80b1a5f7>] ? selinux_file_ioctl+0x47/0xf0
<7>[ 3123.389351]  [<80a227a8>] SyS_ioctl+0x58/0x80
<7>[ 3123.393754]  [<80fb45e8>] syscall_call+0x7/0x7
<7>[ 3123.398043]  [<80fb0000>] ? mmc_do_calc_max_discard+0xab/0xe4
<4>[ 3123.404220] ---[ end trace bd195cf65df321ce ]---

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: CMY <cmy@rock-chips.com>
2015-04-23 17:58:51 +08:00
guoyi
8479c5f245 TP: gt9xx: support early suspend&resume 2015-04-23 17:21:40 +08:00
huang zhibao
ff2d37671f dts: rk3368 box r88 add power led 2015-04-23 10:45:37 +08:00
David Wu
84f5067d74 rk3368: i2c: add i2c sleep pinctrl
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-04-22 02:21:04 +08:00
Zhaoyifeng
d438d9cceb NAND : update dts config for nand.
nandc0reg are unused now,rknand_base.c will check boot media,if
boot form emmc,nand porbe will not enable clock.
2015-04-21 13:03:24 +08:00
Zhaoyifeng
627fe3d23e NAND : add boot media check
Add boot media check , if boot from EMMC,no need to enable nand clock.
2015-04-21 12:57:56 +08:00
zxl
9279372228 RK3368 GPU version: Rogue L 0.14 Remove 'Instead kmalloc to kzalloc'
Signed-off-by: zxl <zhuangxl@rock-chips.com>
2015-04-21 11:03:28 +08:00
Sugar Zhang
5a79ff4cba es8316: fix spk no sound.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-04-21 10:12:24 +08:00
Zhaoyifeng
84917a89f2 NAND : Fix 3368 dts nand clock config
hclk_emem_peri need config for nand.
2015-04-21 09:50:33 +08:00
hjc
14b1c79fc6 rk3368 lcdc: add support serial RGB888 and RGB888 DUMY output
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-20 20:55:42 +08:00
Mark Yao
b8667979fa video: dts: add disp fullscreen for box logo 2015-04-20 17:55:06 +08:00
Mark Yao
a9085919ca video: rockchip: logo: copy loader to framebuffer
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-04-20 17:51:20 +08:00
Mark Yao
4bf5481fa6 video: rga: rga use fs_initcall to init early
We want to use rga for loader logo copy, need rga driver init before
lcdc init.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-04-20 17:51:20 +08:00
hjc
327278fd7b rk3368 lcdc: enable dither up default
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-20 17:07:53 +08:00
hjc
3648385d25 rk fb: extend output mutex lock in win config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-20 17:07:53 +08:00
hjc
95e61b5584 rk3368 lcdc: fix some hidden trouble maybe lead to abnormal when shutdown
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-20 17:07:52 +08:00
hwg
1879153799 wifi: support random mac address and save to file, solve compile warning 2015-04-20 16:23:36 +08:00
hwg
f37e3b555c wifi: support random mac address and save to file 2015-04-20 16:23:28 +08:00
hwg
1212a71d9d wifi driver: rtl8723bs, rtl8723bs-vq0, rtl8723bu, rtl8812au, modify custom mac addr error problem 2015-04-20 16:23:18 +08:00
huang zhibao
70244039d4 rk1000: rk1000 Standby power consumption processing 2015-04-18 15:08:06 +08:00
Alpha Lin
0e06aef4d3 VCODEC: Disable switch ip when construct iommu table.
Depend on iommu do not operate hardware on create iommu table.
VCODEC disable hardware ip switch.

Switch hardware when create iommu table will break the running
schedule of vpu task queue, and cause the hardware stuck.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
2015-04-17 14:16:33 +08:00
Simon
aa34284b75 rk3368: iommu: expose iommu tlb invalidate operation to owner
Signed-off-by: Simon <xxm@rock-chips.com>
2015-04-17 11:11:45 +08:00
Simon
28b00ae9fe rk3368: iommu: delete vop/hevc attach/detach log
Signed-off-by: Simon <xxm@rock-chips.com>
2015-04-17 11:11:42 +08:00
Simon
1617e62c09 rk3368: iommu: workaround for switch between vpu and hevc
vpu/hevc share the same ahb, when switch vpu and hevc,may cause
iommu error,to avoid this error,skip invalidate iommu tlb when iovmm_map

Signed-off-by: Simon <xxm@rock-chips.com>
2015-04-17 11:11:12 +08:00
huang zhibao
b8167b6f7d dst: rk3368-box.dts amend pwm regulator 2015-04-17 10:12:52 +08:00
huang zhibao
b5c698b5c6 dts: 1.add box rk3368 r88 dts; 2.amend 3368 box pwm regulator 2015-04-17 10:09:29 +08:00
hjc
09440c9ed5 rk3368 lcdc: revert lcdc reset when switch hdmi
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-16 20:17:24 +08:00
hjc
b280cfcee1 rk3368 lcdc: add gather config for bandwidth
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-16 20:17:24 +08:00
hjc
5a61bdfd90 rk fb: if lcdc is suspend ignore set par and display
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-16 20:17:24 +08:00
Zheng Yang
29ebc4486f rk3368-box.dts: modify fb display policy to DISPLAY_POLICY_BOX_TEMP.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-04-16 09:35:50 +08:00
hjc
e6ac3de62a rk fb: add fb disp policy for excessive stage
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-15 19:28:05 +08:00
hjc
cc8c69af8f rk fb: add mutex lock for switch screen to prevent
hdmi and cvbs call this function at the same
       time.

Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-15 18:01:04 +08:00
zsq
a8dceb6bb9 change rga.h define to match rk_fb config 2015-04-15 15:53:39 +08:00
zxl
e64ed7772a RK3368 GPU version: Rogue L 0.13
Remove 'Clear cleanup_sync'

Signed-off-by: zxl <zhuangxl@rock-chips.com>
2015-04-15 09:53:37 +08:00
Zheng Yang
3db783a988 rk1000: Fix picture error when suspend and switch mode.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-04-14 22:05:41 +08:00
Zheng Yang
da0c4bb9b0 display-sysfs:
Do not disable HDMI in function rk_display_device_enable.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-04-14 21:16:19 +08:00
CMY
1a2971e2cd rk: ion: Add trace emit function for ion debug
Signed-off-by: CMY <cmy@rock-chips.com>
2015-04-14 19:59:46 +08:00
Zheng Yang
5e925ef55c HDMI: rk_fb_disp_scale is disabled.
Overscan function is achieved by fb driver, so HDMI
	driver do not call this function.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-04-14 19:35:22 +08:00
Zhaoyifeng
e1bce0140d NAND DRIVER: rk3368 support nand.
using __dma_map_area and virt_to_phys instead of rknand_dma_map_single
 and rknand_dma_unmap_single.
    dma_map_single need dev config dma ops struct and config dma_mask.
NAND flash driver has not this config and got the incorrect phy addr return by
dma_map_single.
2015-04-14 17:29:24 +08:00
hjc
307f76c3cc rk fb: add switch enable status when send uevent
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-14 15:42:26 +08:00
Amit Pundir
f56ff9935a arm64: kuser32-bit helpers: do not include unistd32.h explicitly
We get following warnings while building for arm64 arch:
----->8-----
In file included from arch/arm64/kernel/kuser32.S:32:0:
/linaro/android/kernel/pundir/arch/arm64/include/asm/unistd32.h:24:0: warning: "__NR_restart_syscall" redefined
 #define __NR_restart_syscall 0
 ^
In file included from include/asm-generic/unistd.h:1:0,
                 from /linaro/android/kernel/pundir/arch/arm64/include/uapi/asm/unistd.h:16,
                 from /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd.h:50,
                 from arch/arm64/kernel/kuser32.S:31:
include/uapi/asm-generic/unistd.h:390:0: note: this is the location of the previous definition
 #define __NR_restart_syscall 128
 ^
In file included from arch/arm64/kernel/kuser32.S:32:0:
/linaro/android/kernel/pundir/arch/arm64/include/asm/unistd32.h:26:0: warning: "__NR_exit" redefined
 #define __NR_exit 1
 ^
In file included from include/asm-generic/unistd.h:1:0,
                 from /linaro/android/kernel/pundir/arch/arm64/include/uapi/asm/unistd.h:16,
                 from /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd.h:50,
                 from arch/arm64/kernel/kuser32.S:31:
include/uapi/asm-generic/unistd.h:292:0: note: this is the location of the previous definition
 #define __NR_exit 93
 ^
-----8<-----

This patch removes unitstd32.h include to avoid duplication of
"__NR_" syscall definitions.

This patch is based on AOSP commit: cfc7e99e9e,
"arm64: Add __NR_* definitions for compat syscalls", which adds
__NR_* definitions to asm/unistd32.h, moves the __NR_compat_*
definitions to asm/unistd.h and removes all the explicit unistd32.h
includes apart from the one building the compat syscall table.
The aim is to have the compat __NR_* definitions available but
without colliding with the native syscall definitions (required
by lib/compat_audit.c to avoid duplicating the audit header files
between native and compat).

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2015-04-13 15:56:10 +08:00