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

4328 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
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
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
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
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
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
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
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
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
Cai YiWei
2ef2357f15 media: rockchip: isp: fix dmatx width err for yuv422 format 
Change-Id: I2b6c9e2fbb0f46cdddfc57b068d43bb08d0bb169
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-07 19:34:49 +08:00
Hu Kejun
5717d1681f media: rockchip: isp: fix lsc lut error in start/stop test 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I2d317b15f92f7a157da04ab770cd9dc8a243bf05
 2021-01-07 15:47:39 +08:00
Cai YiWei
ebb99ecd46 media: rockchip: ispp: add virtual video for iqtool 
Change-Id: I33229d46cb476e8ab036883238815821fe6119d2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-07 11:36:59 +08:00
Hu Kejun
e5c26944dd media: rockchip: isp: get stats only when meas done is on 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I52b167b0aa52a0e4e636334d3b874fa5616dc6da
 2021-01-06 16:18:54 +08:00
Cai YiWei
56130b06e8 media: rockchip: isp: remove rx enable config 
rx auto enable by csi op_mode

Change-Id: I0e4f807071ceceb1a9c53df5ede0a586febc442a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-01-06 16:16:23 +08:00
Yu Kuai
e92c430002 media: mtk-vcodec: add missing put_device() call in mtk_vcodec_release_dec_pm() 
[ Upstream commit 27c3943683 ]

mtk_vcodec_release_dec_pm() will be called in two places:

a. mtk_vcodec_init_dec_pm() succeed while mtk_vcodec_probe() return error.
b. mtk_vcodec_dec_remove().

In both cases put_device() call is needed, since of_find_device_by_node()
was called in mtk_vcodec_init_dec_pm() previously.

Thus add put_devices() call in mtk_vcodec_release_dec_pm()

Fixes: 590577a4e5 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2020-12-30 11:25:53 +01:00
Cai YiWei
4ee1193154 media: rockchip: ispp: fix panic for vmap at interrupt 
kernel BUG at mm/vmalloc.c:1391!
[<b01f1f30>] (__get_vm_area_node) from [<b01f20c4>] (get_vm_area_caller+0x48/0x50)
[<b01f20c4>] (get_vm_area_caller) from [<b01f2394>] (vmap+0x34/0x64)
[<b01f2394>] (vmap) from [<b04b11e8>] (dma_buf_vmap+0x50/0xec)
[<b04b11e8>] (dma_buf_vmap) from [<b05afb2c>] (vb2_dc_vaddr+0x28/0x30)
[<b05afb2c>] (vb2_dc_vaddr) from [<b05f2014>] (rkispp_frame_end+0x2bc/0x3c8)
[<b05f2014>] (rkispp_frame_end) from [<b05f28a8>] (rkispp_isr+0x19c/0x434)
[<b05f28a8>] (rkispp_isr) from [<b05f589c>] (irq_hdl+0x58/0x60)

Change-Id: Ib4e3814ca77174cd31788f173cadaef01aaa6a4f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-30 15:25:43 +08:00
Tao Huang
5647c1d492 Merge tag 'ASB-2020-12-05_4.19-stable' of https://android.googlesource.com/kernel/common 
https://source.android.com/security/bulletin/2020-12-01
CVE-2020-0444
CVE-2020-0465
CVE-2020-0466

* tag 'ASB-2020-12-05_4.19-stable': (636 commits)
  ANDROID: kbuild: use grep -F instead of fgrep
  ANDROID: GKI: usb: gadget: support claiming indexed endpoints by name
  UPSTREAM: arm64: sysreg: Clean up instructions for modifying PSTATE fields
  Revert "Revert "ANDROID: clang: update to 11.0.5""
  ANDROID: kbuild: speed up ksym_dep_filter
  Revert "drm/atomic_helper: Stop modesets on unregistered connectors harder"
  Linux 4.19.161
  USB: core: Fix regression in Hercules audio card
  x86/resctrl: Add necessary kernfs_put() calls to prevent refcount leak
  x86/resctrl: Remove superfluous kernfs_get() calls to prevent refcount leak
  x86/speculation: Fix prctl() when spectre_v2_user={seccomp,prctl},ibpb
  usb: gadget: Fix memleak in gadgetfs_fill_super
  USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card
  usb: gadget: f_midi: Fix memleak in f_midi_alloc
  USB: core: Change %pK for __user pointers to %px
  perf probe: Fix to die_entrypc() returns error correctly
  can: m_can: fix nominal bitiming tseg2 min for version >= 3.1
  platform/x86: toshiba_acpi: Fix the wrong variable assignment
  platform/x86: thinkpad_acpi: Send tablet mode switch at wakeup time
  can: gs_usb: fix endianess problem with candleLight firmware
  ...

Change-Id: I82ccfc3d6561d3ef3b1b06ac98d48fac997c8fb6

Conflicts:
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
 2020-12-29 16:10:48 +08:00
Hu Kejun
8461719770 media: rockchip: isp: add ioctl to get share buffer fd 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I3b33429007539ccb75859373f6598b5a2c2f7203
 2020-12-28 09:55:57 +08:00
Hu Kejun
cd941afca7 media: rockchip: isp: support iq feature setting 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I870a6f5a54495eb537f32515aec28dfd8ec52f3d
 2020-12-25 15:10:20 +08:00
Cai YiWei
8d5c287ddb media: rockchip: isp/ispp to version v1.3.0 
Change-Id: I27d24dcdea7eeefba4287ffa71c7ca509fd2e194
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-24 11:48:51 +08:00
Cai YiWei
0be314b390 media: rockchip: isp: config dmatx to valid buf addr 
Change-Id: I6e74e3a8e7d298c5620f6e4fab47c615f0b6b30c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-24 10:10:08 +08:00
Allon Huang
324e202bc0 media: rockchip: cif: extend line to fix merge bypass bug for isp20 
sync with isp commit:Ia1ed6a885cffd55859dcec5ad35f22b99d506336

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I62660a8a7f8a69e9d89b884bf17f0a489c051117
 2020-12-23 16:02:04 +08:00
Allon Huang
dc2948f279 media: rockchip: cif: add dvp sof 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ibda8e3de56baaa32cb74fa179c3706c5d3a87d96
 2020-12-23 16:02:04 +08:00
Cai YiWei
2679d1c2f5 media: rockchip: cif: vb2 dma sg for iommu enable 
Change-Id: I06049142d51f4137683a6e871d42cf1b0e3c3fc5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-23 12:46:26 +08:00
Cai YiWei
0d8540d244 media: rockchip: ispp: vb2 dma sg for iommu enable 
Change-Id: If54554daf86b481bbadca636427ffb52c3ca4e67
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-23 12:46:21 +08:00
Cai YiWei
fd37c931a3 media: rockchip: isp: vb2 dma sg for iommu enable 
Change-Id: I50199da38b31a7d9b29673626ed9a0c07be5a94f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-23 12:46:16 +08:00
Cai YiWei
d8fa472205 media: rockchip: ispp: dummy buf map to one page if iommu enable 
Change-Id: Id55ff67679ffb80195bdb97478d0581cb106dab1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-12-22 18:14:33 +08:00