github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
1,079,669 Commits 1 Branch 933 Tags 20 GiB
2d3757bf81
Commit Graph

33789 Commits

Author SHA1 Message Date
LongChang Ma
065ceb71a8 media: rockchip: isp: fixed framerate ctl invalid issue 
When set framerate from small one to big one, will lead to discard
all frame because the is_diacard flag is not reset to "false" in the
change.

Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: I7197d40ec0053c7dad7f2c088d77f7493626ea90
 2023-04-10 14:31:57 +08:00
Zefa Chen
44484c9fcf media: i2c: sensor_adapter fixes error of ioctl miss break 
Fixes: 0bd81e611e ("media: i2c: sensor adapter add ioctl RKMODULE_SET_SENSOR_INFOS")
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iba17ca89821dece817b32019ee3e20c1859b6564
 2023-04-07 19:42:50 +08:00
Zhichao Yu
4b50d2f038 media: i2c: gc4653: fix image corruption when switch sensor flip/mirror 
The configuration of flip/mirror would take effect in the half of frame,
which cause frame corruption. To make sure the flip/mirror configuration
is took effect in the next frame, we should enable register frame buffer
on gc4653.

Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: Ibf85eb46d7c22785a820bcf781bd3e96a3455f00
 2023-04-06 21:26:53 +08:00
Cai YiWei
d297b6606c media: rockchip: isp: version to v2.2.1 
Change-Id: I0a14c0eb03337658812e63b325b4639105d86db3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-04-06 16:55:13 +08:00
Jianwei Fan
24d4113f10 media: i2c: lt7911uxc: fix dcphy params and add more format 
Change-Id: I0ec7fd209a878b899152c45101b03e4a22044692
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2023-04-06 09:30:54 +08:00
Cai YiWei
ebc5802918 media: rockchip: isp: sync dev register and fast_work 
Change-Id: I36617e8c8e277f5616a139fec970fcdedf17256a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-04-04 18:29:57 +08:00
Cai YiWei
d7fed91daa media: rockchip: isp: fix open video during device register 
Change-Id: I9569dd51b5237307ff48e3daf25bf0c97a5fbbb6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-04-04 18:23:11 +08:00
Cai YiWei
464f935a46 media: rockchip: isp: lock for rockit qbuf 
Change-Id: Ic66cae540a91916fa94c59d9541f847070239187
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-04-04 18:23:08 +08:00
Cai Wenzhong
62a74f10f4 media: i2c: thcv244: fix abnormal streaming from video1 to video3 in four cameras. 
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I3fdf4da58de8684ab654ef1166c5c03c479c68cf
 2023-04-03 11:17:53 +08:00
Chen Shunqing
52b4834126 media: rockchip: hdmirx: add hdcp1x key write 
Change-Id: I43d828663e1d3fcdc670d258f883f4a1b3492b06
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2023-03-31 08:46:19 +00:00
Jianwei Fan
ca99cd1152 media: i2c: jaguar1: fix compile error and add enum_frame_interval api 
Change-Id: I93832e248ee6c2c2efc761d2a3bd2e7cea793fae
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2023-03-31 14:38:41 +08:00
Zefa Chen
913273ca12 media: rockchip: vicap: fixes error of access a nonexistent tools_vdev 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia872c7c14eba23ce9d4f38ec152c7705384fcdf1
 2023-03-29 09:16:41 +08:00
Cai YiWei
17e4013e9e media: rockchip: rename isp and ispp uapi head 
Change-Id: I768baae0c406efc0bdc9b13dc2ac745f1365cf45
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-27 09:18:24 +08:00
Zefa Chen
fd32f0f8d6 media: rockchip: vicap: scale video capture follow main stream 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie1d052bae55027d42d8ecb5976c9dccddd1e784c
 2023-03-27 09:13:05 +08:00
Zefa Chen
73fe7e52d3 media: rockchip: vicap: fixes snprintf warning of mipi csi2 error 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie6aed0c88a4ac5d9c5750885ef70fb0b391aa552
 2023-03-27 09:01:27 +08:00
Zefa Chen
ddc6266787 media: rockchip: vicap: fixes issue of tools video register 
tools video only support chip higher than rk1808

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iec7bfa9e9faa0bf520443f7e259c0519496c7b0f
 2023-03-27 09:01:27 +08:00
Cai YiWei
d6fb546c18 media: rockchip: isp: version v2.2.0 
Change-Id: I58699277e15b23c7eb8d4730c8d043164fb4746b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-23 18:41:04 +08:00
Cai YiWei
f035db5f70 media: rockchip: isp: fix read BP_WR_CTRL reg 
Change-Id: I2d448dcd6db98dafeb00209cb9d876a5ee98c51c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-23 18:41:04 +08:00
Jianwei Fan
232b116165 media: i2c: imx577: fix gain step 
Fixes: de9477630d ("media: i2c: imx577: add dgain control")
Change-Id: Ie78a4330a8c38f605db2b07bc867f20cb3a29bb1
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2023-03-22 17:53:02 +08:00
Chen Shunqing
152a4c49b8 media: rockchip: hdmirx: fix error when cec message length is greater than 16 
Change-Id: Iba31625a3178cd6beeca45058dd3cb6c99a896ca
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2023-03-20 10:25:17 +08:00
Zefa Chen
43526c2435 media: rockchip: vicap: rk3588 add iclk_host and rst_host 
if not control it together, may cause vicap do cru reset fail

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie8cc81688ab3c0d1d91b8aa27992b028f8aee80c
 2023-03-17 16:57:18 +08:00
Zefa Chen
7201f0928f media: rockchip: vicap fixes error of overflow when stop stream 
some sensor driver not support get vblank, may cause error state

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I04b869026d262283e055c82b1e9d53233bab3b67
 2023-03-17 16:57:18 +08:00
Zefa Chen
80fa2be8ed media: rockchip: vicap refresh cache before memcpy for tools video 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3cfddddd41fe37e9a04547e52abeb337b556aeed
 2023-03-17 16:57:18 +08:00
Wangqiang Guo
d19bd18e3e media: i2c: sc850sl: add camera sensor driver. 
Change-Id: If3bec0f4a6458ce664ba073565c28d0f9256350d
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
 2023-03-16 19:13:12 +08:00
Cai YiWei
e4423ba4ce media: rockchip: isp: support buf early done 
Change-Id: Icfa088b48105089c4a77aeeebd6b8358d1e90bef
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-16 18:42:41 +08:00
Cai YiWei
d0edc7b3e7 media: rockchip: isp: thunder boot with multi sensor 
Change-Id: I20efdaf70a24e9b892b40bed6420b2988b8125b4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-16 16:30:52 +08:00
Cai YiWei
c8eb54c56b media: rockchip: isp: fix 3a wr with two readback case 
Change-Id: Ib6e55e08dc9634706b2114c6f4d64be15a97ff52
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-16 16:30:52 +08:00
Zefa Chen
b864542b3f media: rockchip: vicap: fix warning of vb2 cancel or done 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I51079641446159444fd6dc2223e5a3f9062001fa
 2023-03-16 11:10:08 +08:00
Tao Huang
cc17504307 Merge tag 'android12-5.10-2023-02_r1' of https://android.googlesource.com/kernel/common 
android12-5.10 February 2023 release 1

Artifacts:
  https://ci.android.com/builds/submitted/9611440/kernel_aarch64/latest

* tag 'android12-5.10-2023-02_r1': (5560 commits)
  ANDROID: GKI: Enable ARM64_ERRATUM_2454944
  ANDROID: dma-ops: Add restricted vendor hook
  ANDROID: arm64: Work around Cortex-A510 erratum 2454944
  ANDROID: mm/vmalloc: Add override for lazy vunmap
  ANDROID: cpuidle-psci: Fix suspicious RCU usage
  ANDROID: ABI: update allowed list for galaxy
  FROMGIT: f2fs: add sysfs nodes to set last_age_weight
  FROMGIT: f2fs: fix wrong calculation of block age
  ANDROID: struct io_uring ABI preservation hack for 5.10.162 changes
  ANDROID: fix up struct task_struct ABI change in 5.10.162
  ANDROID: add flags variable back to struct proto_ops
  UPSTREAM: io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups
  UPSTREAM: eventfd: provide a eventfd_signal_mask() helper
  UPSTREAM: eventpoll: add EPOLL_URING_WAKE poll wakeup flag
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/self components"
  UPSTREAM: Revert "proc: don't allow async path resolution of /proc/thread-self components"
  UPSTREAM: net: remove cmsg restriction from io_uring based send/recvmsg calls
  UPSTREAM: task_work: unconditionally run task_work from get_signal()
  UPSTREAM: signal: kill JOBCTL_TASK_WORK
  UPSTREAM: io_uring: import 5.15-stable io_uring
  ...

Change-Id: I2b16474d6e3a91f1d702486ec6d1565a7bc310e3

Conflicts:
	Documentation/ABI/testing/configfs-usb-gadget-uac2
	Documentation/usb/gadget-testing.rst
	Makefile
	arch/arm/boot/dts/rk3288-evb-act8846.dts
	arch/arm64/mm/Makefile
	drivers/dma-buf/dma-buf.c
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
	drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
	drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/mmc/core/mmc.c
	drivers/pci/controller/dwc/pcie-designware-host.c
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/regulator/core.c
	drivers/usb/dwc3/ep0.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/f_hid.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/f_uac2.c
	drivers/usb/gadget/function/u_audio.c
	drivers/usb/gadget/function/u_audio.h
	drivers/usb/gadget/function/u_uac2.h
	drivers/usb/host/xhci.h
	drivers/usb/storage/unusual_uas.h
	drivers/usb/typec/altmodes/displayport.c
	include/linux/page_ext.h
	mm/cma.c
	mm/page_ext.c
	sound/core/pcm_dmaengine.c
	sound/soc/codecs/hdmi-codec.c
	include/linux/stmmac.h
	sound/drivers/aloop.c
	drivers/pci/controller/dwc/pcie-designware.h
 2023-03-14 09:44:51 +08:00
Tao Huang
71573dc8b5 media: rockchip: vicap: make rkcif_vb_done_oneframe() static 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I98511206f1aae711512240a89c97c48fa26e2e5f
 2023-03-13 09:14:38 +08:00
Cai YiWei
7ca7e7ce1f media: rockchip: fix isp no work due to irq_ends_mask error 
Change-Id: I62dc2383720adb03b8ade6affbea7ee50ffa4427
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 20:05:25 +08:00
Cai YiWei
acd9ec5a6d media: rockchip: isp: fix warning of vb2 cancel or done 
Change-Id: Icf3cc6392b7741de80487341771c8f40319a6a01
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 18:55:45 +08:00
Zefa Chen
6309778b1f media: rockchip: vicap fixes tools buffer state error 
list_add double add: new=ffffff8074334fa8, prev=ffffff8074334fa8, next=ffffff8004630f30.
Change-Id: Ie2222c73b4af106107a5a4ae0f7c4ef6fde6cce8
------------[ cut here ]------------
kernel BUG at lib/list_debug.c:31!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
Modules linked in:
CPU: 2 PID: 1904 Comm: xc:isp_rx_poll Not tainted 5.10.110 #43
Hardware name: Rockchip RK3562 EVB1 LP4X V10 Board (DT)
pstate: 60400085 (nZCv daIf +PAN -UAO -TCO BTYPE=--)
pc : __list_add_valid+0x60/0x90
lr : __list_add_valid+0x60/0x90
sp : ffffffc01bd239c0
x29: ffffffc01bd239c0 x28: 0000000000000001
x27: ffffff8004614080 x26: ffffffc012069000
x25: ffffff8074334fa8 x24: ffffff8074334fa8
x23: ffffff8004630f30 x22: 0000000000000000
x21: ffffff8004630f80 x20: ffffff80046305e0
x19: ffffff8074334c00 x18: ffffffc017d95088
x17: 0000000000000000 x16: 00000000000000ee
x15: 0000000000000004 x14: ffffffc011c2c608
x13: 0000000000003fff x12: 0000000000000000
x11: 0000000000000000 x10: 0000000000000000
x9 : 48479b2270d3d900 x8 : 48479b2270d3d900
x7 : 3030386666666666 x6 : ffffffc011e39170
x5 : ffffffffffffffff x4 : 0000000000000001
x3 : ffffffc0118e7649 x2 : ffffff80fb7408c8
x1 : 0000000000000000 x0 : 0000000000000058
Call trace:
 __list_add_valid+0x60/0x90
 rkcif_buf_queue+0x1ec/0x6f4
 __enqueue_in_driver+0x48/0xe8
 vb2_core_qbuf+0x150/0x4d4
 vb2_ioctl_qbuf+0xd0/0x108
 v4l_qbuf+0x48/0x5c
 __video_do_ioctl+0x2c4/0x3c4

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8e0843780bae55296209d06a4dd223ad21603f99
 2023-03-10 15:34:25 +08:00
Zefa Chen
8919ab5395 media: rockchip: vicap fixes bug of wake up mode 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie51db5cb7944ce0f979344f4e00f0d75816642e9
 2023-03-10 14:36:41 +08:00
Zefa Chen
20cca8578a media: rockchip: vicap fixes the processing order errors of fs and line intr 
change for earlier chip than rk3588

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ide6815ec488b71e2b7eff9b4b2345eeedbc53b3a
 2023-03-10 14:36:16 +08:00
Chen Shunqing
17e2bcaabc media: rockchip: hdmirx: fix alignment fault when memory copy 
The dst is device memory, when accessing dst, it need alignment, use
memcpy_toio instead of memcpy.

Change-Id: I2f0af816c92fdb9871ff4842e10522980e9a1c50
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2023-03-10 02:47:53 +00:00
Zefa Chen
eefbce4bf8 media: rockchip: vicap fixes error when used dvp with online mode 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I823dbf7c54176f7a0fed7dcfcc2cd066473cbf33
 2023-03-10 09:52:12 +08:00
Cai YiWei
09137a828c media: rockchip: isp: fix isp32 lite mainpath switch fail 
Change-Id: I90f65bd537721c62508f67f16db85ec6b8751ce7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 09:05:01 +08:00
Cody Xie
dd8a854160 media: rockchip: isp: Return error code for ioctl set_meshbuf_size 
Change-Id: If6d9f73c756343eb6c3c0c1cc6bf1fd09fde0825
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-10 09:04:58 +08:00
Chen Shunqing
53edaaa977 media: rockchip: hdmirx: reconfig cec after resume 
Change-Id: I5333531f09d26558b023858566b392df0ae284f0
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
 2023-03-09 20:01:20 +08:00
Yiqing Zeng
8334ade617 media: i2c: sc3336 reset/pwd gpio should set low output by default for normal case 
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I026cc9b6026d3641df861d60111d08369097fd59
 2023-03-07 20:05:02 +08:00
Zefa Chen
964565ca62 media: i2c: ar0230 add delay up to 20ms after software reset 
otherwise may write register fail

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If9079e4840b1df81533db4f3d2d0d5a2806b6c0e
 2023-03-07 09:13:15 +08:00
Cai YiWei
e175652953 media: rockchip: isp1: pm_runtime_put change to sync 
Change-Id: If6ff03a7aced3c2795b150b5b807e31f521031c1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-03 18:37:55 +08:00
Cai YiWei
37c278bce0 media: rockchip: fix isp and cif build warning 
Change-Id: I6924f6a833679c945fe0469efa07b66b28440edc
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-03-03 10:04:12 +08:00
Su Yuefu
5ac9e8096d media: i2c: support techpoint driver 
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: Ia579416e730ae7da65d614d35997683a3caf1bd7
 2023-03-02 15:35:57 +08:00
Zefa Chen
dba7790c26 media: rockchip: vicap fixes pclk polarity for rv1106 
Fixes: 74aca7167d ("media: rockchip: rv1106 vicap support dvp")
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I521d0f56061486f7db4ebe283382aa69c4f2d5e3
 2023-03-01 16:19:25 +08:00
Zefa Chen
fce76cf947 media: rockchip: vicap support rockit 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4748ecdf0909c8af71a311f43022b796c531d5be
 2023-02-28 21:18:16 +08:00
Yiqing Zeng
9a3e2b4d71 media: i2c: gc2053 support slave mode 
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Ia851a9de5443c835be9c1c2b1d89625062742682
 2023-02-28 14:35:55 +08:00
Jianwei Fan
ee38b2089a media: i2c: gc2093: set gpios output mode when use gpios 
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I7f91264f7202393a9041721f221c0a098cc79624
 2023-02-28 14:34:51 +08:00
Jianwei Fan
1296e0f778 media: i2c: ov16a1q: add ov16a1q camera sensor 
Change-Id: I9a19655697f231dedff577c1572e5663aa7bfc0d
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2023-02-28 14:34:34 +08:00