Commit Graph

10818 Commits

Author SHA1 Message Date
Cai YiWei
ebb21b9936 media: rockchip: ispp: fec support in out diff size
Change-Id: I469876b24fb96a856703625a0bec23d2e0dbd3e5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-16 18:45:29 +08:00
Cai YiWei
3080b1c4e8 Revert "media: rockchip: isp: extend pixel to 32 for isp30 unite mode"
This reverts commit b3260da5e9.

Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Change-Id: I3c322a0d187fcfcf38daac2dbd0f4ada6fd89fe4
2023-02-15 14:13:27 +08:00
Cai YiWei
e83e121d6f media: rockchip: isp: add iqtool video for isp32 lite
Change-Id: If5d31fc2b75e9aa0980044c47a8e429cc7e2a1b5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-14 09:54:27 +08:00
Cai YiWei
b38fc755a5 media: rockchip: isp: add isp32 lite
Change-Id: I3cdd29809e629df7903605d07e2dd2da40bcef01
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-14 09:54:06 +08:00
Cai YiWei
c38ee7a65d media: rockchip: isp: version v2.1.0
Change-Id: Ie02dfdad44f9f67a765fe577b609346552a35a59
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-07 17:14:31 +08:00
Cai YiWei
9f908ad29d media: rockchip: isp: stats buf add application params frame id
Change-Id: Ib343caba3c4e378661d83f0485a9e0a2940367f3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-02-07 17:14:31 +08:00
Dingxian Wen
238571a101 media: rockchip: hdmirx: modify the enum definition of hdmirx color space
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I23070858c0c7ea573af2bdf34652639bac551e68
2023-02-06 17:20:50 +08:00
Algea Cao
0a8b81fb3f drm: bridge: dw-hdmi: Support cec wake up
If cec in standby status, cec wake up interrupt will be
triggered when specific cec message is received.
Then input power key event to wake up system.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I91b4482ab78f91e5e9df66fa8384e118b08f35a2
2022-12-27 14:59:54 +08:00
Cai YiWei
b819ded322 media: rockchip: isp: wrap width and height config by user
Change-Id: I5090f57f4231da2af258991b264e8f91a46b5adb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-12-27 09:15:01 +08:00
Cai YiWei
1b33d33635 media: rockchip: isp: add mosaic block size for cmsk
Change-Id: Ic5696540c569a287b7c3c1f6c32edbeeeaa1f757
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-12-23 15:10:04 +08:00
Cai YiWei
3800ed1278 media: rockchip: isp: api to force enum multi isp resolution
Change-Id: Idcbbdc3d4324fc7b1dd3c27eab3a1cab6e25f1bb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-12-19 16:51:16 +08:00
Cai YiWei
2570d9e1ed media: rockchip: isp: fix isp32 cmsk feature
Change-Id: I8706e04509b2c7e8a46fcf50be477f9c7e4e766a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-12-13 15:20:57 +08:00
Zhen Chen
034aad5dd8 MALI: rockchip: upgrade bifrost DDK to g15p0-01eac0, from g13p0-01eac0
Note, the corresponding mali_csffw.bin for DDK g15 MUST be used.

Change-Id: Ic30634fa6247d62bf96f506c64d13b89e16b02e6
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2022-11-22 14:13:04 +08:00
Jon Lin
b7cf98650b mtd: spi-nor: core: Support misc devices
Calling ioctl PCIE_DMA_GET_FLASH_INFO to get spi nor id.

Change-Id: I1ecfdd527f18c0c323fba9673546c167032d1726
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-11-17 12:06:59 +08:00
Simon Xue
da4d118936 PCI: rockchip: dw: add standard ep mode driver
Change-Id: Id365b71acaa1db846b619fedd7397a9256d8e13f
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-11-02 17:35:14 +08:00
Cai YiWei
2b6d89cc5d media: rockchip: ispp: fec optimize dmabuf
Change-Id: Iac2b94f416567802ce982b0155d9b0f982f04791
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-31 17:12:41 +08:00
Andy Yan
f727d3ad8e drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format
This introduces specific definitions for vendor Rockchip and its
associated tiled format modifier. This modifier is used for the
output format of the Video/JPEG Decoder, that can be imported
directly with the VOP2.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I03c1a51af5fd8bc0702209ae216c4706b4101c49
2022-10-11 16:38:27 +08:00
Zhen Chen
c38b77a6e2 MALI: rockchip: upgrade bifrost DDK to g13p0-01eac0, from g12p0-01eac0
Note, the corresponding mali_csffw.bin for DDK g13 MUST be used.

Change-Id: I63c00b4eccd2e780aea2691faa2ecea6847c41e2
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2022-09-23 15:21:15 +08:00
Chen Shunqing
0d2ccf6058 drm/rockchip: dw_hdcp2: add reset func for ioctl
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I76c30690d5fa36489b930757a8fe749c0c085a66
2022-09-16 11:09:09 +08:00
Dingxian Wen
9e6cf9710f media: rockchip: hdmirx: add private v4l2 event
add private v4l2 event: RK_HDMIRX_V4L2_EVENT_SIGNAL_LOST

Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: Iad6f519b36ebb7e18305e211f989795c9ebe3fdc
2022-09-15 20:58:39 +08:00
Cai YiWei
be3f404824 media: rockchip: isp: version v2.0.0
Change-Id: I538c3abb84a338e730c2bd266485ceb4bae6166d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-09-09 15:10:37 +08:00
Wangqiang Guo
d64e12ecb4 media: rockchip: hdmirx: add private ioctls
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I29ab409097d875c8ea253cc92fe16f4787301e1d
2022-08-30 10:16:35 +08:00
Hu Kejun
9a283e9984 include: rk_vcm_head: add set max logical position ioctl
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Id29dbd8052b6ddb6bab122d56a64281d31da9d29
2022-08-29 21:03:37 +08:00
Cai YiWei
f82495fca0 media: rockchip: ispp: support fec/orb image stabilization
Change-Id: Idf6b56d44bf9ab0c0137ffaca26436752f30b57d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-08-09 15:23:17 +08:00
Cai YiWei
36d10fca69 media: rockchip: ispp: separate param/stats video device
Change-Id: I9cc94eb59b2704f27d16ce37aa6b8e8d33f84a7e
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-08-09 15:23:17 +08:00
Zefa Chen
c0122f5de1 include: uapi/linux/rk-camera-module.h add RKMODULE_GET_READOUT_LINE_CNT_PER_LINE
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic89639c97016d993a431a7f7ea67c05ecf62d428
2022-08-04 16:14:04 +08:00
Zefa Chen
3bafc15055 include: uapi: rkcif-config.h: add cmd RKCIF_CMD_SET_CSI_IDX
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I91aa19d72e2442433231f158ba722d1393e04fa8
2022-08-01 15:12:54 +08:00
Cai YiWei
b3260da5e9 media: rockchip: isp: extend pixel to 32 for isp30 unite mode
Change-Id: I26030c63a9f255dc68a4d2b1bb9ba46718d81110
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-07-29 10:40:28 +08:00
Zhang Yubing
8f36a88f84 drm/rockchip: Add dw hdcp2 controller driver
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I0ac6ee46e0f97714f76fbf613a2400627343546d
2022-07-26 14:51:41 +08:00
Tao Huang
c7a43f0886 Merge tag 'ASB-2022-06-05_12-5.10' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2022-01-01
CVE-2022-24958
CVE-2022-20136
CVE-2022-23960
CVE-2022-20141
CVE-2021-4154
CVE-2022-20132

* tag 'ASB-2022-06-05_12-5.10': (1188 commits)
  BACKPORT: net/sched: cls_u32: fix netns refcount changes in u32_change()
  UPSTREAM: io_uring: always use original task when preparing req identity
  FROMLIST: remoteproc: Fix dma_mem leak after rproc_shutdown
  FROMLIST: dma-mapping: Add dma_release_coherent_memory to DMA API
  ANDROID: Update QCOM symbol list for __reset_control_get
  ANDROID: vendor_hooks: Add hooks for mutex
  BACKPORT: can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
  BACKPORT: can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: oplus: Update the ABI xml and symbol list
  UPSTREAM: remoteproc: Fix count check in rproc_coredump_write()
  BACKPORT: esp: Fix possible buffer overflow in ESP transformation
  ANDROID: Fix the drain_all_pages default condition broken by a hook
  UPSTREAM: Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6"
  UPSTREAM: xfrm: fix MTU regression
  ANDROID: signal: Add vendor hook for memory reaping
  FROMGIT: usb: gadget: uvc: allow for application to cleanly shutdown
  FROMGIT: usb: dwc3: gadget: increase tx fifo size for ss isoc endpoints
  UPSTREAM: usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind()
  FROMGIT: usb: gadget: uvc: remove pause flag use
  ...

Change-Id: Idf3eea3b21dc69c8189161c0e24744336431913a

Conflicts:
	drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
	drivers/spi/spi-rockchip.c
	drivers/usb/gadget/function/f_uvc.c
	drivers/usb/gadget/function/uvc.h
	drivers/usb/gadget/function/uvc_configfs.c
	drivers/usb/gadget/function/uvc_queue.c
	drivers/usb/gadget/function/uvc_video.c
	sound/soc/rockchip/rockchip_i2s.c
2022-07-15 17:58:38 +08:00
Tao Huang
24cbee6672 Merge tag 'ASB-2022-04-05_12-5.10' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2022-04-01
CVE-2021-0707
CVE-2021-39800
CVE-2021-39801 (4.9 only)
CVE-2021-39802

* tag 'ASB-2022-04-05_12-5.10': (3832 commits)
  ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus
  ANDROID: vendor_hooks: Reduce pointless modversions CRC churn
  UPSTREAM: locking/lockdep: Avoid potential access of invalid memory in lock_class
  ANDROID: mm: Fix implicit declaration of function 'isolate_lru_page'
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: GKI: Add hook symbol to symbol list
  Revert "ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree"
  ANDROID: vendor_hooks: Add hooks to for free_unref_page_commit
  ANDROID: vendor_hooks: Add hooks to for alloc_contig_range
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: vendor_hooks: Add hook in shrink_node_memcgs
  ANDROID: GKI: Add symbols to symbol list
  FROMGIT: iommu/iova: Improve 32-bit free space estimate
  ANDROID: export walk_page_range and swp_swap_info
  ANDROID: vendor_hooks: export shrink_slab
  ANDROID: usb: gadget: f_accessory: add compat_ioctl support
  UPSTREAM: sr9700: sanity check for packet length
  UPSTREAM: io_uring: return back safer resurrect
  UPSTREAM: Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
  ...

Change-Id: Ic61ead530b99b10ffd535a358a48fe9bb8c33fd4

Conflicts:
	drivers/android/Kconfig
	drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/i2c/busses/i2c-rk3x.c
	drivers/media/i2c/imx258.c
	drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
	drivers/usb/dwc2/gadget.c
	drivers/usb/gadget/function/uvc.h
	lib/Kconfig.debug
2022-07-15 17:40:39 +08:00
Lin Jinhan
2035a4673c soc: rockchip: add hardware decompression user interface
Export the hardware decompression interface to the user layer.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I033f0beabc2e44022418dcd06798ad94e971ff10
2022-07-15 15:42:35 +08:00
Zefa Chen
1e7c74a7aa include: uapi: linux: rk-camera-module: add commond RKMODULE_SET_SENSOR_INFO
Its for sensor adapter to sync all of sensor state, to avoid isp getting the wrong state
in the case of app execution order: sensor0 config param -> run isp0 ... sensorn config param -> run ispn

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I90cc6a1716d5198150b5a0897ada0412622b72d3
2022-07-14 20:09:36 +08:00
Zefa Chen
f1082a51d0 include: uapi: rkcif-config: add reset CMD
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I52ca7f84b6afcb8f286604fbef7e0940a9b20a4a
2022-07-14 10:57:04 +08:00
Jason Zhang
a2c96f974d iio: Add channels for LSM6DSR sensor HUB
Add new channels types support for LSM6DSR sensor HUB:
* IIO_SIGN_MOTION
* IIO_STEP_DETECTOR
* IIO_STEP_COUNTER
* IIO_TILT
* IIO_TAP
* IIO_TAP_TAP
* IIO_WRIST_TILT_GESTURE
* IIO_GESTURE

Signed-off-by: Jason Zhang <jason.zhang@rock-chips.com>
Change-Id: I8f3f2feae32b94ad6802a9a359ec11ab94a96816
2022-07-08 17:31:28 +08:00
Jason Zhang
2c5b0fb9db iio: Add FIFO event for LSM6DSR sensor HUB
Add FIFO event type:
* IIO_EV_TYPE_FIFO_FLUSH

This change also adds FIFO event directions:
* IIO_EV_DIR_FIFO_EMPTY (indicates the FIFO is empty)
* IIO_EV_DIR_FIFO_DATA (indicates the FIFO is not empty)

A FIFO flush event is triggered after the HW FIFO is flushed,
and indicates that whether the HW FIFO is empty or not.

Signed-off-by: Jason Zhang <jason.zhang@rock-chips.com>
Change-Id: Idb21bc271c7fd8def63f2cb29440ebf0677688d5
2022-07-08 17:31:28 +08:00
Jianqun Xu
54d5477652 drm/rockchip: drm gem support flags ROCKCHIP_BO_DMA32
Userland can use the flag ROCKCHIP_BO_DMA32 to tell drm gem to get pages
limit to 4GiB memory.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Icdc77efae71ed6272f425ad93a07c8d3e98a9ca4
2022-07-04 18:09:22 +08:00
Cai YiWei
d46850b0ab media: rockchip: isp: support mesh buf count from user for isp30 and isp32
Change-Id: If2473f0a040f97786833fdfdadb2928e5092a575
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-07-04 11:24:41 +08:00
Jianwei Fan
280c9a89fa include: rk-camera-module: add hdmi2mipi-csi mode control
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Ia1257ec877b82ac6ba3f5b283960742b61908215
2022-06-28 15:39:22 +08:00
Cai YiWei
a4678e961a media: rockchip: isp: api for video to free tb reserved memory
Change-Id: Ia7ca669fac6c58a700fff9f1f18d51210da484b7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-28 15:14:45 +08:00
Cai YiWei
6977a0278f media: rockchip: isp: api get fast stream output info
Change-Id: I770906113078104b22731a83bf3280331f3ac15e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-28 15:14:45 +08:00
Zhen Chen
ab86d8ad07 MALI: rockchip: upgrade bifrost DDK to g12p0-01eac0, from g11p0-01eac0o
Change-Id: Ifde51336daa7c735118a314fcfc2fde38d7132b3
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2022-06-21 11:27:08 +08:00
Cai YiWei
78bb39759a media: rockchip: isp: thunderboot for isp32
Change-Id: Id9e7ee4f009ae18f4943ac3252ee766ea4532b80
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-13 14:53:16 +08:00
Jianwei Fan
f9d6f92544 media: rockchip: vicap add CSI RGB888 format input support
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Iaaaf63a380e3c8de461f1c5a651a1f7efc313773
2022-06-13 14:47:03 +08:00
Hu Kejun
ec83376701 include: rk_vcm_head: add advance mode config
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I6cb4837fd0557e9c903b132b67913f67723a461c
2022-05-30 16:28:04 +08:00
Cai YiWei
4bd2aaeb8a media: rockchip: isp: sync params state
The configured parameter buf, module_cfg_update will
set to 0 for user.
ISP2X_MODULE_FORCE BIT(64) for parameter buf to use.

Change-Id: I54f867b4ca50ae1ebfbee884b44bbf1a5cfc53b9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-05-26 16:32:24 +08:00
Jianqun Xu
61a32e157e dma-buf: dma-heap: heap ops supports get_phys
This patch makes the dma-heap device support to get physical address by
DMA_HEAP_IOCTL_GET_PHYS. The sub heaps can add a support to this ops.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I1daf65f742ce48db5548aa3fb860bb3fb4e2291d
2022-05-25 15:13:52 +08:00
Wang Panzhenzhuan
828f51750a media: rockchip: rk-led-flash: use __kernel_old_timeval
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I23dd287426e378410789c07991cdbd4231e339b0
2022-05-21 17:35:07 +08:00
Lian Xu
b0127db292 media: rockchip: isp: ctrl the fps for isp32
Change-Id: Ia2d780d263bc14327527b9e87607a823f1e7936f
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2022-05-05 10:55:19 +08:00
Cai YiWei
e4fb9c7c15 media: rockchip: isp: api to free mesh buf for user
Change-Id: Ic651fa7655848badb8792a54a01703fc25c839d3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-22 14:21:05 +08:00