Commit Graph

1060023 Commits

Author SHA1 Message Date
Ding Wei
a4e0ffd261 arm64: dts: rockchip: rk3399: add mpp support
Change-Id: I56ff3ed1c49cf3524c9fe9284021c611c1a4b76c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-09-01 18:04:09 +08:00
Shengfei Xu
661ac6db68 power: test_power: add testpower dts-config
Change-Id: Ib2c78602f604d610a648397cbf08c56cdbd77eab
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2021-09-01 17:27:26 +08:00
Sugar Zhang
c0b196cd5b power: reset: reboot-mode: Register callback for kernel pre restart
This patch register boot mode into kernel pre restart call chain
to support 'reset [cmd]'

e.g.

/# fiq
Welcome to fiq debugger mode
Enter ? to get command help
debug> help
FIQ Debugger commands:
 reset [<c>]   Hard reset with command <c>
debug>
debug> reset loader
DDR Version V1.04 20201030
DDR4, 328MHz
BW=32 Col=10 Bk=4 BG=2 CS0 Row=16 CS=1 Die BW=16 Size=2048MB
...
boot mode: loader
...
RKUSB: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1d1f000

Change-Id: Ic1792bdd0262c77a09fd780c7ac3e6d912b09008
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-09-01 17:04:42 +08:00
Andy Yan
2c7919c02b power: reset: reboot-mode: treat unrecognized reboot mode as normal mode
Some bootloader will check the reboot mode to take different action, so
we treat unrecognized reboot mode as normal mode to prevent the system
run into abnormal case.

Change-Id: I88063a5b41e4e645443229fa490b2b55db5ccf27
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-09-01 17:04:42 +08:00
Andy Yan
3c6335dce5 power: reset: reboot-mode: support parse boot mode
Parse boot mode on system bootup, and export it to
userspace by sysfs: sys/kernel/boot_mode

Change-Id: I0158fc28f4dae51c798806006e49cead4ce2e923
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-09-01 17:04:42 +08:00
Tao Huang
3b939be7fb power: reset: reboot-mode: fix normal mode setup
If cmd is empty in get_reboot_mode_magic, we should return normal magic.

Change-Id: I10931adc49e33f72ae73d9471159f82cc02ff0c0
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-09-01 17:04:42 +08:00
Joseph Chen
5187691184 mfd: rk808: remove duplicate content
Change-Id: Ie2de3186579213c565c3b38a2c68955f2a7fd227
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2021-09-01 11:28:18 +08:00
Tao Huang
e0c0be6024 arm64: rockchip_gki.config: Enable CONFIG_ROCKCHIP_SUSPEND_MODE
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0298046864e1e3b88b5909ed30784bf0e2d496c2
2021-08-31 18:12:16 +08:00
Tao Huang
5703bfaa81 arm64: rockchip_defconfig: update by savedefconfig
reorder CONFIG_ROCKCHIP_SUSPEND_MODE only.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4d23e47e9123e73c2aaca498bb1ce6da86b91327
2021-08-31 18:12:16 +08:00
Shengfei xu
31f3d7317e soc: rockchip: pm_config: set the suspend config to ATF
Change-Id: I400aa252c24b814e3da7fa6703a4e03a1c90d572
Signed-off-by: Shengfei xu <xsf@rock-chips.com>
2021-08-31 18:12:16 +08:00
shengfei Xu
d4174a3bdf soc: rockchip: pm_config: use new function to disable secondary CPUs
System add the function suspend_disable_secondary_cpus to disable
secondary CPUs.

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I770154cdb0c8f14b14e705d07604c44a4e3c1632
2021-08-31 18:12:15 +08:00
Jianqun Xu
892d24b59b arm64: dts: rockchip: rk3588 add ioc node
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I61235232fa98a2c4fe0d06de00a3a51132640a7e
2021-08-31 18:11:16 +08:00
Simon Xue
eb86d472c3 arm64: dts: rockchip: rk3588s: add wdt node
Change-Id: Iebf556fcba4a330bc819042d09c02a7da49601b3
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-08-31 18:08:20 +08:00
Simon Xue
523b04c03a arm64: dts: rockchip: rk3588s: add saradc node
Change-Id: I0e8e972fc867cc8dd65b33244e68442b8d043b5d
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-08-31 18:04:14 +08:00
Cai YiWei
d600ace1e2 media: rockchip: isp/ispp to version v1.6.2
Change-Id: I3959939530392f71313a3e30132d9746533f2d36
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:18 +08:00
Cai YiWei
bd01d85285 media: rockchip: ispp: first frame handle for multi dev
Change-Id: Ie4bc4c8b8a7486fca6bd6b55ca395eb774997120
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:17 +08:00
Cai YiWei
10bf39031d media: rockchip: ispp: fix driver mode sync with ispserver
Change-Id: Id3dad2f5c4e8a326f6c8541bdf75d8b8630b603d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:16 +08:00
Cai YiWei
2e110a6dc4 media: rockchip: ispp: fix page fault due to scl exit early
Change-Id: I8a7499a5d6e10707269525f7a0aa7a01b5aae7d6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:15 +08:00
Cai YiWei
49be5cf622 media: rockchip: isp: add v-blank to procfs
Change-Id: Ic62bf4b3fe26712ce4382025b1a234a55453c631
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:14 +08:00
Hu Kejun
bafe1aa446 media: rockchip: isp: fix set pdaf in dpcc error
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I1c1782091b0e011535b34b46c69a5cc805f3d103
2021-08-31 16:38:14 +08:00
Cai YiWei
4beac95035 media: rockchip: ispp: fbc error handle
Change-Id: I9c303ef76831ed45962991a8d7d6e8b67fce78f8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:13 +08:00
Cai YiWei
1427b10e9f media: rockchip: ispp: reset at frame end
Change-Id: I83d1bd9c4464fc138bf87f349e3f464b74eefd38
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:12 +08:00
Cai YiWei
c5df6c9eb0 media: rockchip: ispp: frame buffer done early
config wait-line to ispp virtual device dts node,
or ispp debug node before open ispp video.
/sys/module/video_rkispp/parameters/wait_line

for example: output is 2688x1520, config
wait-line to 768 (128 align), vb2 buffer
will done when poll image processing greater
than 768, wait-line less than (height - 128) is valid.

Change-Id: I4a448cc6baffbb5794eef91965e4b2bc349aa5ed
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:11 +08:00
Cai YiWei
70dc5c1037 media: rockchip: isp: frame buffer done early
config wait-line to isp virtual device dts node,
or echo value to debug node before open isp video.
/sys/module/video_rkisp/parameters/wait_line

Change-Id: I5c73c90117455663620b4c025e78aa6233ca40b9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:10 +08:00
Xu Hongfei
b0a19c2d18 media: rockchip: ispp: fix bug that ispp register isn't included in SEI
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: Icfc0e722c2ea4734c863b0ea478df312ddbb826f
2021-08-31 16:38:09 +08:00
Ziyuan Xu
098dbbad63 media: rockchip: isp/ispp: declare slab.h for kmalloc/kfree
Change-Id: I515dfc032819df9c4dfb235a413403567392d9d0
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2021-08-31 16:38:08 +08:00
Cai YiWei
9e9bbd341c media: rockchip: isp: dmarx support yuv format
Change-Id: I0375e0defa96bb3d3b1573170b203ecfce33219e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:08 +08:00
Cai YiWei
354dc4cebe media: rockchip: isp: disable params when it stream off
Change-Id: I534c6052217e3bec01d1abb9efd1eaf1c97a1f7b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:07 +08:00
Cai YiWei
f8a8644e28 media: rockchip: isp: add lock for isp stream
Change-Id: I25f128a59eaf953d8b8c42313ea8afd82e7229ae
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:06 +08:00
Cai YiWei
8d1aabfe34 media: rockchip: isp: clear rdbk fifo at dmarx stop
Change-Id: If26ebfa218da49d272c1e4aa0a2e8c7e4361ba5f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:05 +08:00
Cai YiWei
a46f59ac2d media: rockchip: fix isp and ispp share dmabuf release fail
Change-Id: I80d34b89c0dd8965baebbc9cd75b0877f5e4ed9d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:04 +08:00
Cai YiWei
d6bc411f94 media: rockchip: isp: fix same frame id
cur frame end and next frame start irq will
togeter if v-blank is short. to handle sof
event later if this happens.

Change-Id: If45300c8f640a6516624c4952e4f124afd7a9952
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:03 +08:00
Cai YiWei
7bb93a8e2e media: rockchip: isp: hdr direct for isp21
Change-Id: Ia5befcdf241c22fe29ca3a2c0298547c8b4d664f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:02 +08:00
Cai YiWei
a8b0239607 media: rockchip: isp/ispp to version v1.6.1
Change-Id: I6a9cdac4874a02cb0465c87aa23d7180d2109d3d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:01 +08:00
Shunqian Zheng
51eca44b4c media: rockchip: ispp: destory ispp buffers if start_stream failed
Clean up the buffer pool if start streaming failed.

BUG=redmine:#301918

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Change-Id: I4abcf17ef0c66dabcddcfac7395c7efabbfe6e47
2021-08-31 16:38:01 +08:00
Cai YiWei
e09ef72629 media: rockchip: ispp: reserved memory using rdma_sg ops
Change-Id: I7bc3cb977c56fc6c81c15baa67d38e3ce59a409f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:38:00 +08:00
Cai YiWei
5546067644 media: rockchip: isp: reserved memory using rdma_sg ops
Change-Id: Ia01770c3f54bfbb3d65a73c7db0e8ab8730ab29d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:59 +08:00
Cai YiWei
5109655419 media: rockchip: isp: isp21 get 3a stats from ddr
Change-Id: I223a654d65377f866e1b71d0652f889a5ffbf079
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:58 +08:00
Cai YiWei
eb488add0a media: rockchip: isp: apply en params if no match for isp21
Change-Id: I72bf7551ac78d035561405d9a61bb40990925085
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:57 +08:00
Cai YiWei
08f4d76015 media: rockchip: isp: apply en params if no match for isp20
Change-Id: I47bc2b58aae016df1bb6ba0a1425431bed53ca9d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:56 +08:00
Cai YiWei
44baa78c81 media: rockchip: isp: add bt601/bt709/bt2020 colorspace
rkisp-isp-subdev pad2 to change colorspace and quantization

Change-Id: I077eb9482cd09119c11f2515e848dca203c42357
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:55 +08:00
Cai YiWei
598f7e02a5 media: rockchip: isp: separate rdbk from csi subdev
Change-Id: I8c5f42c7d5526634e49b2934fb28026702de17c9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:55 +08:00
Cai YiWei
3b4cc8c2d3 media: rockchip: isp: dmatx support embedded and shield pixels data
Change-Id: Ifb07d7a7b11d44a5843dfe3a66284e38b98fbbb6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:54 +08:00
Cai YiWei
7b82a42749 media: rockchip: ispp: fix page fault due to config reg during working
Change-Id: Ie5e23fc0e79a946b692278fc28b4a7794fe1a5f4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:53 +08:00
Fenrir Lin
0bd6f83dfc media: rockchip: isp: fix the problem of no data when no reserved memory
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Ia94a8032fae6c741376924c98dae336e4a9329bd
2021-08-31 16:37:52 +08:00
Cai YiWei
b818d97299 media: rockchip: isp: max height 3072 for isp21
Change-Id: I02ef7a19679597f9a4028c29e55d134d597091c4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:51 +08:00
Cai YiWei
8799055d92 media: rockchip: isp: use same api to set clk
Change-Id: I0229675cc2ff13ca4c30e3c32b4e69e4318ff6d8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:50 +08:00
Cai YiWei
53c41d150a media: rockchip: ispp: disable sharp output if it bypass
Change-Id: I094dcce7ee12f77e5f524a46d9565a63f4523801
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:49 +08:00
Cai YiWei
186fdf90b0 media: rockchip: isp/ispp adjust probe order
isp hw device -> isp virtual device then
ispp hw device -> ispp virtual device

Change-Id: I7897f50c2323c2d57b0eb143a53423390d6d7d6c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:48 +08:00
Cai YiWei
3e8baf6650 media: rockchip: isp: add monitor to restart if abnormal
enable monitor:
add rockchip,restart-monitor-en to rkisp node on dts or
echo Y > /sys/module/video_rkisp/parameters/monitor
NOTE: shouldn't enable this when porting camera!!!

Change-Id: I35fa45488136e2e0ec16c4e6179a39f34cf5ebc9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:47 +08:00