Commit Graph

1059974 Commits

Author SHA1 Message Date
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
Cai YiWei
0fca9e8350 media: rockchip: ispp: dma buf alloc limit to DMA32
Change-Id: Id0a8cda55bce267ba3a6fd51599b17d7d10dc26e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:46 +08:00
Cai YiWei
2d243f431a media: rockchip: isp: dma buf alloc limit to DMA32
Change-Id: Ibc1f4afc45a031714ee4cabfc70b38f930706d46
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:46 +08:00
Cai YiWei
fe0ef1d4b5 media: rockchip: isp: resolution limit for isp21
Change-Id: I046ac456fad9d4617c8fcc4f228409f59d23281a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:45 +08:00
Fenrir Lin
bef090db70 media: rockchip: ispp: add vidioc_enum_input
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Id2b2c34b80245a2fa8dec97c5ca9ca64dd2c7363
2021-08-31 16:37:44 +08:00
Cai YiWei
2c4fb4942b media: rockchip: isp/ispp add check for params subscribe event
Change-Id: If8b79286de5d9921abd69c96cb0b17ef297d75ef
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:43 +08:00
Cai YiWei
93b52078a6 media: rockchip: isp: update procfs info
Change-Id: I48d64f9e579ca6eee1af5b707420a055e5b1b17f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:42 +08:00
Cai YiWei
4033489c82 media: rockchip: isp: fix multi dev refcnt
Change-Id: Id6c742f1ce90bdf327b382864a26739bdf80661e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:41 +08:00
Cai YiWei
7c513c616c media: rockchip: ispp: config default params
Change-Id: I8ef48c03123149564835143d4bda5dc011e7e9d3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:40 +08:00
Cai YiWei
f7fb9e42a9 media: rockchip: ispp: optimize first frame memory copy
Change-Id: I38803f1b8cb5bbe6fe53856037eb9214c0e85cbe
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:39 +08:00
Cai YiWei
6f4298adbc media: rockchip: isp/ispp to version v1.6.0
Change-Id: I21b36b5f4738e912ee6409b045c00198ef016c42
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:38 +08:00
Cai YiWei
126a959455 media: rockchip: isp: capture buf queue add to list tail
Change-Id: I21e030408ca936bd6f567536a6c12c9be3caebf5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:37 +08:00
Cai YiWei
c95ad09232 media: rockchip: ispp: change fec data state if params buf no use
Change-Id: I278d7ec35a39b2ce18af6553cdca33892ec1382b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:36 +08:00
Cai YiWei
155e064aa9 media: rockchip: isp/ispp to version v1.5.2
Change-Id: I75d545c76ca4e59392211db9dbafd379141bbf19
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:35 +08:00
Cai YiWei
3c8b7fb6a5 media: rockchip: isp: adjust rdbk times with mulit dev for isp2.0
Change-Id: I0d15991a0f17ce0498435a296d8b997e30f6fc38
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:35 +08:00
Cai YiWei
f4445a70c0 media: rockchip: ispp: add uvnr sd32 self en control
Change-Id: I57c0ed94b7916a9ea2a17c0ab761bad3d0af27a4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:34 +08:00
Cai YiWei
80bbd6e06d media: rockchip: isp: support multi dev for isp21
Change-Id: I5973f952d0b744448025496c29a1c6b4c5316db3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:33 +08:00
Cai YiWei
d5e4c5b58b media: rockchip: isp: make sure 3dlut no continuous read twice
if 3dlut enable and 3DLUT_UPDATE = 1,
will start read lut at following case:
1. isp force update
2. frame end
2->1 shouldn't for 3dlut.

Change-Id: I82d03836035bc06e25839fe4d90dba7cd36c2e1a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:32 +08:00
Cai YiWei
88842979a2 media: rockchip: ispp: check SHARP_CORE_CTRL after update
Change-Id: Iad0d7b2c1e9a0f1222d5055656b598ce542b6d54
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-08-31 16:37:31 +08:00
Sandy Huang
f95443e4c8 drm/panel: panel-simple: Don't init gpio value at probe
When enable display on loader, init gpio would change
gpio status, that would make screen flash.

Change-Id: I4b69a8d3d83c5bef09014c2134abaee6522a7046
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-08-31 15:25:26 +08:00
Frank Wang
392cd16600 arm64: dts: rockchip: rk3588s: add usbdp phy device node
This adds USBDP combo PHY related nodes for RK3588S SoCs.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I838233adebc584a60f36cad76c01a9d1a075e8f3
2021-08-31 15:04:13 +08:00
Yifeng Zhao
3530c21737 arm64: dts: rockchip: add sata for rk3588
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I0b6a83bca3ce1809a5004e6ac1b34eed0729b0c8
2021-08-31 14:50:00 +08:00
Yifeng Zhao
39481cd6d3 arm64: dts: rockchip: add naneng combophy for rk3588
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ie4b56fb1a018d1ab0c9d4ee0cccaebde7703eaad
2021-08-31 14:46:34 +08:00
Sugar Zhang
67d041d478 arm64: dts: rockchip: rk3588: Fixup i2s/spdif nodes
This patch move device nodes which belong to rk3588 into
rk3588.dtsi.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ie02c44bf955496b6c73a9ecdf9290c97e61cbcd4
2021-08-31 14:08:00 +08:00
Jianqun Xu
eca1fb4744 arm64: dts: rockchip: rk3399: modify gpu node for ARM Midgard driver
Change-Id: I46ff1b61787172a5b4ba5b378e00c6de4cfa7f8d
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-08-31 11:29:17 +08:00
William Wu
a27395c5bf arm64: dts: rockchip: rk3588s: add usb controllers nodes
The rk3588s supports multiple USB controllers:
1.2 x USB2.0 HOST (EHCI&OHCI)
2.1 x USB3.0 OTG  (DWC3)
3.1 x USB3.0 HOST (xHCI)

This patch adds nodes for these USB controllers.
Note that the phys properties of USB controlles are not
added yet, and they will be added later.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Id16319990fc570ab2f71673463ffd70d5df3bfb8
2021-08-30 19:58:09 +08:00
Kever Yang
b684f15d8c arm64: dts: rockchip: add rktimer for rk3588
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: Iad6ecb6a21a4a7d97f7677e9e585523f210d6c3f
2021-08-30 16:00:10 +08:00
Ding Wei
e1e1eabccd arm64: dts: rockchip: rk3588s: Add mmu nodes for video codecs
Change-Id: Id6ac46d1772a29e20834f4e46d342b8a5ede6545
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-08-30 15:45:34 +08:00
Felix Zeng
1775a5f995 driver: rknpu: Add rknpu driver for rk356x, version: 0.5.0
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: Ia9c19e37024d085010ef4c86a420ed5a9c831915
2021-08-30 15:15:28 +08:00
Tao Huang
06c006f76a arm64: rockchip_gki.config: Enable CONFIG_ROCKCHIP_RKNPU
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I80da4a62eaea705955cadd4fa6faf4830be699ee
2021-08-30 15:15:28 +08:00
Felix Zeng
e72b8c6176 arm64: configs: rockchip_defconfig: Enable rknpu module
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: Ie86cfb931e46983875a4ee2adcf5760166bb38e8
2021-08-30 15:15:28 +08:00
Sugar Zhang
7052d7de3c arm64: dts: rockchip: rk3588s: Add i2s/pdm/spdifrx/spdiftx nodes
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia967e33488241e509283bb4732d4651dbc069515
2021-08-30 15:04:38 +08:00
Sandy Huang
ef7eb42f48 drm/rockchip: vop2: enable dither up when input rgb565
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I554924b979735e2377b1e9d06b22b2d9b35450a4
2021-08-30 14:51:56 +08:00
Andy Yan
b7fb6c5626 drm/rockchip: vop2: Use normalized zpos
Some linux app may be set zpos without any check.
For example mpv: change the zpos of overlay
plane from default value 2 to 1, but the primary
plane zpos is also 1.

Change-Id: I6015c171c6512dc7f10bed7c56933941c9d64a2e
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-08-30 14:51:56 +08:00
Sandy Huang
c6db7fb1dc drm/rockchip: vop2: add support cubic lut from loader
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I11d65477364dc9ff4fb34d038179d5702faeb484
2021-08-30 14:51:47 +08:00
Sandy Huang
5579c96182 drm/rockchip: vop2: add support 10bit yuv and srgb output
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iee5aad90edff69c00884bc25cc7dc2169d3103d2
2021-08-30 11:07:21 +08:00
Sandy Huang
8b5885eee1 drm/rockchip: vop2: output error info when cluster use non afbc format
This is special feature at rk356x, the cluster layer only can support
afbc format and can't support linear format;

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic8efc26c07a088c246969622fcf2973b00abd9c2
2021-08-30 11:07:16 +08:00
Andy Yan
c553334fe7 drm/rockchip: vop2: wait port_mux cfg done before configure new plane
We need two vsync cycle when move a window from
on vp to another: the port_mux take effect in
first vsync, than enable the window at second
vsync.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I87c1ac0803081ecb201d9218d40fdea89424fbd8
2021-08-30 11:07:11 +08:00
Andy Yan
d8d8a665cd drm/rockchip: vop2: Only register used vp to drm
A registered vp(crtc) need a primary plane, some
linux style display software(X11/weston) want more
overlay plane, so we don't register unused vp to
save some plane for overlay.

Change-Id: I66846af7364d1a20f38f35d65ed3fe34b7f280ab
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-08-30 11:07:06 +08:00
Finley Xiao
e7a722ad59 soc: rockchip: pvtm: Add support for RK3588 SoCs
This adds the necessary data for handling pvtm on the RK3588 SoCs.

Change-Id: I3a6b4699a5b36fa318dd8e10843fa47079eb5c6c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-08-27 20:30:15 +08:00
Finley Xiao
f56f097d95 arm64: dts: rockchip: rk3588: Add tsadc device node
Change-Id: I9677dad752a4f380e984b42a8ee042eef924b6d1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-08-27 20:23:31 +08:00
Finley Xiao
d1bf298cac dt-bindings: rockchip-thermal: Support the RK3588 SoC compatible
Add a new compatible for thermal founding on RK3588 SoC.

Change-Id: I95d1d03b74adfcf18884ca2ec797053a9a686d95
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-08-27 20:21:38 +08:00
Finley Xiao
a151b91a34 arm64: dts: rockchip: rk3588: Add pvtm device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia846f55e970acda591d8a6a3fdc758bd09a34060
2021-08-27 20:20:18 +08:00
Simon Xue
e92d09741c iommu: rockchip: update .attach_dev/.detach_dev logic
ISP has following steps for exception handling:

	pm_runtime_get_sync
		|
		|
	iommu_detach_device
		|
		|
	ISP CRU RESET
		|
		|
	iommu_attach_device

The final purpose is to re-enable iommu by calling iommu_attach_device.
However, .detach_dev does not called by iommu_detach_device due to iommu
framework logic, which lead to .attach_dev called by iommu_attach_device
can not completely finished as iommu->domain did not changed by
.detach_dev. The iommu finally is in reset state due to ISP CRU RESET.
So, we remove checking iommu->domain here to let things going.

Another thing, if master attach it's own domain, to keep iommu_node
balance, .detach_dev must also remove checking iommu->domain.

Change-Id: Iedcafbb6d2d8ee0b927c952dde24c1689ff6b65b
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-08-27 18:40:40 +08:00
Finley Xiao
859d7df6f7 dt-bindings: rockchip-pvtm: Support the RK3588 SoC compatible
Add a new compatible for thermal founding on RK3588 SoC.

Change-Id: Icb1a915f0dcb4cbc32bc6cb5e3d54b86f9397985
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-08-27 17:42:36 +08:00
Elaine Zhang
5df480db6f clk: rockchip: rk3588: rename some clks
1) rename pvtm clks name;
2) usbdp and mipidphy share one ref clk;
3) hdmitx, hdmirx, and usb2phy share one ref clk;

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I2c85609359424ed388a051f4bb04b0d401c05d12
2021-08-27 17:42:18 +08:00
Finley Xiao
3fbcef574f arm64: dts: rockchip: rk3588: Add gpio func for tsadc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I625871a5b6238ae664698a5fe81d911183a72a18
2021-08-27 17:35:22 +08:00
Finley Xiao
49f6b1ac3f arm64: dts: rockchip: rk3588: add otp device node
Change-Id: I316f21efae865b819839180a4dc6c9f90afb2fc4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-08-27 17:31:35 +08:00
Tao Huang
31942565f6 arm64: rockchip_gki.config: Enable CONFIG_SND_SOC_ROCKCHIP_I2S_TDM
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0d62076671987d047ad709b34707604a0714d2de
2021-08-27 16:10:50 +08:00
Sugar Zhang
6c7029ca49 ASoC: rockchip: Add support for i2s/tdm controller
This patch adds support for i2s/tdm controller which support
I2S, PCM, TDM.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I428e311402220ff14441c48e13fa51356ced46e8
2021-08-27 16:09:46 +08:00