github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-12 16:57:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
862,781 Commits 1 Branch 934 Tags 20 GiB
d43184d461
Commit Graph

29326 Commits

Author SHA1 Message Date
Tao Huang
b50aca0c9a Merge tag 'ASB-2021-02-05_4.19-stable' of https://android.googlesource.com/kernel/common 
https://source.android.com/security/bulletin/2021-02-01
CVE-2017-18509
CVE-2020-10767

* tag 'ASB-2021-02-05_4.19-stable': (809 commits)
  ANDROID: GKI: fix up abi issues with 4.19.172
  Linux 4.19.172
  fs: fix lazytime expiration handling in __writeback_single_inode()
  writeback: Drop I_DIRTY_TIME_EXPIRE
  dm integrity: conditionally disable "recalculate" feature
  tools: Factor HOSTCC, HOSTLD, HOSTAR definitions
  tracing: Fix race in trace_open and buffer resize call
  HID: wacom: Correct NULL dereference on AES pen proximity
  futex: Handle faults correctly for PI futexes
  futex: Simplify fixup_pi_state_owner()
  futex: Use pi_state_update_owner() in put_pi_state()
  rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
  futex: Provide and use pi_state_update_owner()
  futex: Replace pointless printk in fixup_owner()
  futex: Ensure the correct return value from futex_lock_pi()
  futex: Prevent exit livelock
  futex: Provide distinct return value when owner is exiting
  futex: Add mutex around futex exit
  futex: Provide state handling for exec() as well
  futex: Sanitize exit state handling
  ...

Change-Id: Ieba6ee3a91a05d504e1f829a84e7d364e7d983f2

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3328.dtsi
	drivers/md/Kconfig
	drivers/usb/gadget/function/f_uac2.c
 2021-02-26 15:30:04 +08:00
Zhenke Fan
2443b518f1 media: i2c: sc500ai: fix set vflip/hflip failed bug 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Iaa36ece66310489a8576c5eeb4137779af412a48
 2021-02-26 14:23:28 +08:00
Cai YiWei
157c77620d media: rockchip: isp and ispp add shutdown 
Change-Id: Iec748f28a6662c104b66a2ab44e0946515061320
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-02-26 10:46:15 +08:00
Dingxian Wen
861438e0fd media: i2c: rk628csi: add rk628csi HDMI to MIPI CSI-2 bridge driver 
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I0e4d75763ffd4edbc4e3c3ab7c9f6e7f0b69bbf7
 2021-02-24 14:38:33 +08:00
Frank Liu
b88c7c9d1f media: i2c: sc2310: fix the bug of switching hdr 
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I87122cf4c6c3a47b303739ed2b1eec7cfc4e34c6
 2021-02-23 11:19:24 +08:00
Xu Hongfei
7a96299fce media: rockchip: isp: support output isp/ispp reg in nv12 format 
used by follow steps :
1. echo Y > /sys/module/video_rkispp/parameters/sendreg_withstream
2. echo videoX > /sys/module/video_rkispp/parameters/sendreg_withstream_video_name

Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: I68f332accc6d617d46289727fe50c93f62fe67c3
 2021-02-22 16:19:34 +08:00
Xu Hongfei
ab2d34feaa media: rockchip: isp: switch hdr_done interrupt according to hdrtmo cnt mode 
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: Ibe1a23e5871daf32bf0646ccc022b2a7f371b08c
 2021-02-21 11:50:29 +08:00
Cai YiWei
6d1700b91d media: rockchip: isp: fix media link err for name don't match 
Change-Id: I604754b36da12dbde9443580019a3bb1d7d6a884
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-02-08 17:19:58 +08:00
Cai YiWei
e3b2078f73 media: rockchip: isp: reorder of subdev stream 
on: isp->phy->sensor(start to output)
off: sensor(stop already)->phy->isp

Change-Id: I592f8e8e36f4c912e3f38b3f4266e98bfd9e56e4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-02-08 17:19:57 +08:00
Cai YiWei
3877d5ca77 media: rockchip: ispp: sync to free buf for multi dev stream off 
Change-Id: If2c61d83cf33317cdc2ec69ceca7ffd899f11816
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-02-08 17:19:57 +08:00
Cai YiWei
b0ec07ceeb media: rockchip: ispp: check scl stop if fec enable 
Change-Id: I3bbdd113ca37b1faa2f091eeb255dab056189da9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-02-08 17:19:57 +08:00
Cai YiWei
0339aa961f media: rockchip: ispp: limit min clk to 50 
Change-Id: Ia63b22af54df6f2b01c725084e416156aab168bc
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-02-08 17:19:57 +08:00
Xu Hongfei
7f51aa1c40 media: rockchip: isp/ispp to version v1.5.1 
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: Ie67690626c55f2c41a1b246f0b9349aff46972bb
 2021-02-08 17:19:57 +08:00
Hu Kejun
799ad4b3f2 media: rockchip: ispp: check frame id when apply params 
Change-Id: I4816fd87c4730c29716dd35a7721a66265eb3587
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
 2021-02-08 17:19:57 +08:00
Xu Hongfei
4331ba1b1d media: rockchip: isp: set lgmean related regs for tmo in hdr isr 
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: I36442cf617c8ddbf54ae659071fe1f057bc9830b
 2021-02-08 17:19:57 +08:00
Hu Kejun
51c730a4e4 media: rockchip: isp: use force big mode when auto big mode is incorrect 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ifbbe86b5571029e76be66aab7bdbf94af012d64e
 2021-02-04 16:09:53 +08:00
Zhenke Fan
deabd31d51 media: i2c: imx378: fix bug for dgain error, 1xdgain is 256 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Id5953082da47ccf07a86a9b4fc108b957344a55f
 2021-02-02 14:44:27 +08:00
Zhenke Fan
c2e20ad987 media: i2c: ov4688: fix the power on timing sequence 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I74a6fdcab6e5e3f3fe57e07024b46c648fd7783a
 2021-02-02 14:43:51 +08:00
Allon Huang
21640649a5 media: rockchip: cif: fix rk356x iommu err 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I249cfb2bd8023e6ae498fb0ee9dc168fe3c0f534
 2021-02-01 17:23:49 +08:00
Vicent Chi
5120ed3b52 media: i2c: nvp6188: Improve more interfaces to adapt to 8 channels 
Change-Id: I3e18b68967e5c17b1e7a1cdd9167062965239c49
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
 2021-01-30 15:09:01 +08:00
Frank Liu
e3d4f2aec9 driver: media: i2c: add os02g10 driver 
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I538512282db79cc7ed226b64d6848a329808843a
 2021-01-30 14:12:24 +08:00
Zefa Chen
262595ff25 media: i2c: imx327 fixed linear mode exposure calculation 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia5a64608872e480138b0b65fafed388c91004437
 2021-01-30 14:10:25 +08:00
Cai YiWei
6700f30703 media: rockchip: isp: fix extend line with isp input crop case 
Change-Id: If92cb8e8960374b56ca37013dc4b0af8f6857990
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-30 14:05:53 +08:00
Cai YiWei
2ae52f15a0 media: rockchip: isp: fix array overflow 
Fixes: 5358e9d0b6 ("media: rockchip: isp: 64 align y size for fbcgain format")
Change-Id: Ic73e28ade0800562eeca1863277dc414c85e49d6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-26 17:57:46 +08:00
Allon Huang
474c2aa03d drivers: media: platform: rockchip: cif: restruct cif reset monitor 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Iec0b8499f4a3da086421bc7ab28566bb27ca6aa8
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
 2021-01-26 14:19:14 +08:00
Cai YiWei
1afd77fecc media: rockchip: ispp: remove debug log 
Change-Id: I44512687d6edd2c1b8242d5c770f26a785007e66
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:13:01 +08:00
Zhichao Yu
26e77bc0b1 media: i2c: imx307: support 60fps linear mode 
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I011f058014e4e59a6d80fc9c44101e5e6172c903
 2021-01-22 20:13:01 +08:00
Cai YiWei
2d1456c1a6 media: rockchip: isp: fix mpfbc buf update if readback off 
Change-Id: I57b48d6055759a426808fbd085cd913265742739
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:13:01 +08:00
Allon Huang
6bc30b2c2b drivers: media: i2c: nvp6188: add get stream sequence interface 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I8e9ac70a6ad565e75a4f6f3e3b9168eec20de363
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
 2021-01-22 20:13:01 +08:00
Hu Kejun
2a1585104a media: i2c: vcm: support config max current 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I02503eadd93ab6c9c462630721353e85b830d9bd
 2021-01-22 20:13:01 +08:00
Hu Kejun
2664922167 media: i2c: vcm: set default position to vcm in resume function 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I8852b5fcc754afc3228b6e300fa8f672d9f45703
 2021-01-22 20:13:00 +08:00
Hu Kejun
99c49523fc media: i2c: vm149c: support set/get vcm config ioctl 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Id40695e61e4e5daf6664084867f4980f848bdef5
 2021-01-22 20:13:00 +08:00
Hu Kejun
a21a5c1944 media: i2c: fp5510: support set/get vcm config ioctl 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I19fc9732149ce17eb8613e710579ee7d5120c51f
 2021-01-22 20:13:00 +08:00
Hu Kejun
6731223dc2 media: i2c: dw9714: synchronize with gt9760s 
1. support set dlc/t_src/mclk by dts;
2. add ioctl to set vcm config;
3. update lsc move time;

Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I3fe7132fca65d82786927cd36ddbb57f341c22b3
 2021-01-22 20:13:00 +08:00
Vicent Chi
38df211534 media: cif: add stream sequence conifg strategy 
Change-Id: If6dca4ca1243f218f3e429a6628aae56a35d9058
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
 2021-01-22 20:12:59 +08:00
Cai YiWei
29aa91cb2a media: rockchip: isp: fix path select of cif input 
Change-Id: I4c48c5cebc876fd19f4a080c1c689f8c1e06d0b9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:12:59 +08:00
Vicent Chi
41c1b4d8ba media: i2c: add nvp6188 driver 
Change-Id: I6dac1dc7bf10555cccb56c625dc032fdeb1f8d41
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
 2021-01-22 20:12:59 +08:00
Zefa Chen
b936c045b3 media: i2c: sc4232 fixed 2688x1520 linear 10bit to 25fps 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I038b1543fecc656baadab3dd6cb6bfc7926acaa6
 2021-01-22 20:12:59 +08:00
Cai YiWei
fe63f20b12 media: rockchip: isp/ispp fix config of clk_dbg 
Change-Id: I884474ffe2d5cf27600f20c4b8d005e317f3ec36
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:12:59 +08:00
Cai YiWei
8ad3589e44 media: rockchip: ispp: add trigger mode ioctl 
sync trigger on/off status with user

Change-Id: Ifc567cc760f5fc106644ce80a6a96c7c5fc1afd2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:12:59 +08:00
Cai YiWei
5358e9d0b6 media: rockchip: isp: 64 align y size for fbcgain format 
Change-Id: Ic1ad912f094a3442e0c4d421f4228dd6c8bbe92c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:12:59 +08:00
Cai YiWei
076891bc3e media: rockchip: isp: fix gain buf update 
isp2.0 one frame read back many times and gain
address will updated at each read back end. To make
sure gain buffer update right, so one last read back
to the frame start to config next buf, and the frame end
will update to shadow reg for ready to receive next frame.

Change-Id: I1be92f92f9489b7d1ffb5ca72a510e9ea45f5ab0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:12:58 +08:00
Cai YiWei
569ae93661 media: rockchip: isp: support to set format if no streaming 
Change-Id: I17b9433eae512aa05b295df6b3e86f5c88db0d47
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:12:57 +08:00
Cai YiWei
a2eee96da1 media: rockchip: isp/ispp get vaddr in buf queue 
avoid to map vaddr when vb2_plane_vaddr at interrupt

Change-Id: Id391a405973a9838fbc97065e4e27f6b88c07b8c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-22 20:12:56 +08:00
Cai YiWei
23bbd27fb4 media: rockchip: isp/ispp add vb2_rdma_sg_memops to support contiguous page 
Change-Id: Ic33bfe6fe5d6e095fc1943fd2933376c42360f17
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-12 19:02:10 +08:00
Cai YiWei
c5068a72e0 Revert "media: videobuf2-dma-sg: support contiguous page by dma attrs" 
This reverts commit 46e7d9882b.

Change-Id: I8b7511cd20ae6a0b5cf853e1e07888ea55932bac
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-12 19:02:10 +08:00
Hu Kejun
0f8ee5f7c3 media: rockchip: isp/ispp to version v1.4.1 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ida51065ebc94ead3fe490a8a48f771e6a941cd36
 2021-01-11 10:02:38 +08:00
Hu Kejun
0cb7561455 media: rockchip: isp/ispp: support motion detection mode 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I76b3349d4a05f07154c2879bc35c3440778e0914
 2021-01-11 10:02:27 +08:00
Cai YiWei
eebb8c213f media: rockchip: isp/ispp set core clk to low freq if no stream output 
Change-Id: I5d8dcfd27c8be4a0520d9bf5e18057f5376d98ef
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-08 17:27:13 +08:00
Cai YiWei
505e09028a media: rockchip: isp/ispp add dma contiguous attrs 
if device add reserved memory area and enable iommu,
pages can alloc from contiguous memory region, this
need DMA_ATTR_FORCE_CONTIGUOUS attrs.

Change-Id: I12e00467a1f7e4c6661397663835c328351715b9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-07 19:34:49 +08:00