github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
854,928 Commits 1 Branch 934 Tags 20 GiB
2f3804a21c
Commit Graph

7107 Commits

Author SHA1 Message Date
Cai YiWei
c66e0dd7db media: rockchip: isp and ispp version to v0.1.6 
Change-Id: I8546593a0fb54bc563a0450effbb0547f6e495fc
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-09-11 19:07:31 +08:00
Allon Huang
8e99dadcf8 media: rockchip: cif: add proc interface 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ifd8a5195ba7e5446a71c1d3f03e0ba2961ba49d5
 2020-09-11 15:37:27 +08:00
Cai YiWei
a8998c8dee media: rockchip: isp and ispp version to v0.1.5 
Change-Id: Ie3ce13831c7e7bf5a8cdd2b2095533cd130e2c9b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-09-04 18:15:57 +08:00
Cai YiWei
5959cb856d media: rockchip: isp and ispp version to v0.1.4 
Change-Id: Ie11ba53aeb11cba104f42a40e6d70c783298ce4f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-08-31 10:37:45 +08:00
Cai YiWei
10232a98b0 media: rockchip: isp: switch hdr frame mode for read back 
Change-Id: I4077f35579023b30e42952dd2c2ac917b49cbfbf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-08-28 19:04:56 +08:00
Cai YiWei
0c27e7e4a5 media: rockchip: isp and ispp version to v0.1.3 
Change-Id: Ib1afcd69a66d786fc5bb884510ea7d94cb6dd56b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-08-25 12:07:38 +08:00
Hu Kejun
fb8191d684 media: platform: rockchip: cif: update version to v0.1.7 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I5c9809ee241b6b09bab573ca2bfe023187b7cd65
 2020-08-25 11:24:30 +08:00
Allon Huang
5452fec4f4 media: rockchip: cif: let memory compact mode can be set from user space 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Id0e6bd0b9992215a8d1c4169b83e2c4765a697b1
 2020-08-18 11:08:29 +08:00
Hu Kejun
6968bab0cd media: rockchip: isp/ispp/cif/camera: add api version in common header 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I59a68acb068131483c80da5865cdbe4800b59975
 2020-08-14 14:58:13 +08:00
Dingxian Wen
e7d6a11012 media: v4l2-ctrl: add private controls base for TC35874X 
Change-Id: I3e8cdb61e4403f5c6b22ad8cc6f8d7eab0a8cc00
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
 2020-08-12 09:24:06 +08:00
Cai YiWei
fb9c868033 media: rockchip: ispp: support sharp fbc rotation 
Change-Id: Ide6b2adf289d03524b0105b3b7640c419e86fb2a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-07-22 14:12:00 +08:00
Allon Huang
74e1e1627e include : uapi: linux: camera: change struct rkmodule_lvds_cfg for lvds sync code parameters 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I4cdf7d7d4c4454f42de3614bdbc1c193f39616c3
 2020-07-22 09:55:35 +08:00
Sandy Huang
1656d858b1 Revert "drm/modes: add dclk invert config parse" 
This reverts commit 4492caa259.

remove rockchip private flag.
use DRM_BUS_FLAG_PIXDATA_NEGEDGE to instead of DRM_MODE_FLAG_PPIXDATA.

Change-Id: I24ce988a84a4a5793f7eb3e26e51293988d854d0
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-07-21 09:16:29 +08:00
Hu Kejun
b9ab138ec6 media: rockchip: isp: support thunderboot mode 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I7964c6cab499fd8ea914f37451155261e9f2a4a0
 2020-07-06 19:00:16 +08:00
Sandy Huang
8f6868e3f2 drm: Add DRM_CLIENT_CAP_SHARE_PLANES ioctl 
this is only used to compatibility with old hwc code

Change-Id: Idcf2ca235d320656adf20d010dcd3a3940159c0d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-07-03 10:32:23 +08:00
Sandy Huang
4400d60d25 Revert "drm: introduce share plane" 
we use new method to implement vop win lite multi area support.

This reverts commit 8b19e980a6.

Change-Id: I2b5ac07ba38fdb416291635719d0634b7824268c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-07-03 10:14:09 +08:00
Zhenke Fan
f6b6c4c402 media: i2c: gc4c33: modify dpcc to adjust single and multiple bad point 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Iaf12ded3604ec26e9b61833e1fd4004e03acb110
 2020-06-30 15:34:41 +08:00
Zefa Chen
7407ef7aeb media: i2c: camera driver gc4c33 add cmd for get nr switch threshold 
Change-Id: Ibf8365c0c3d55496f37438577497b086b14a7496
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
 2020-06-19 19:16:11 +08:00
Zhenke Fan
23e78f669f media: i2c: gc4c33: add set dpcc cfg 
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I3216c75987d8fa2046668cb47adba72826e1dca6
 2020-06-19 16:36:50 +08:00
Cai YiWei
5fda33fe2e include: rk-camera-module: add ioctl lvds mode 
Change-Id: I3baa26f3257a84f43bb29cc563f27cfc742a5ce8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-06-18 19:21:53 +08:00
Cai YiWei
ccc9c32708 media: rockchip: sync frame id and timestamp for isp and ispp read back mode 
Change-Id: I0c7c8dc9ce574680332936f83e034ae8787aa687
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-06-01 14:51:03 +08:00
Zefa Chen
3e0d014bd0 media: i2c: imx347 fixed exposure issue 
Fix HDR frame rate, correct Tline
support conversion gain control

Change-Id: I7c9c8a6b81206f46d2d3f3f4e0580e7831b32fd3
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
 2020-05-25 18:20:38 +08:00
Zefa Chen
e34fc5b233 include: rk-camera-module: add cmd for conversion gain 
Change-Id: If756567d63696131e8c67d14fd08d751f58c443d
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
 2020-05-25 18:20:38 +08:00
Hu Kejun
c9a04358e5 media: rockchip: ispp: change fec mesh number 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I68bf7bfdd080486083b5177ade48ed2dcb8d1fd9
 2020-05-25 18:20:31 +08:00
Hu Kejun
8d1d0cfb64 media: rockchip: isp: change ldch mesh number 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I2ce3fb8f996347d26ddd398e9066d9dc82707429
 2020-05-25 18:20:31 +08:00
Hu Kejun
7c60625d66 media: rockchip: isp: config iq param on different place 
rdbk mode:
1. config iq param effecting immediately before each stream start;
2. config iq param effecting on next frame at last v start of current frame;

other mode:
1. config iq param on each frame end;

Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I10178c2f62fe6792b359434324e16e307cdf7620
 2020-05-25 18:20:28 +08:00
Cai YiWei
f6061a0b51 media: rockchip: ispp: add module_init_ens to decide which function on 
Change-Id: Ie6412446cc9b0fd54c6dc6fb277e1564c538da62
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:20:26 +08:00
Cai YiWei
389b672b3e media: camera: add ioctl for get/set hdr mode 
Change-Id: I4d0a891be7ee9afa14e9bb977be7a075e85c5365
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:20:08 +08:00
Hu Kejun
d9b92139e5 media: rockchip: isp: fix some awb bug 
1. fix awb gain is not enabled when use rawawb only;
2. add new register of rawawb;

Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ieb59732e42acc5bd326982b3128a5cb4781e4ee2
 2020-05-25 18:20:06 +08:00
Hu Kejun
4f4b86c75b media: rockchip: isp: change ae/hst name to match datasheet 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ie8e3944977f47903e72b36c4c793ecb537ff283d
 2020-05-25 18:20:04 +08:00
Hu Kejun
4b9158e03a media: v4l: add dataformat for rockchip luma/ispp stat 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I3e883b8066f27003bd50ce830aeb662dd4dc861f
 2020-05-25 18:20:02 +08:00
Hu Kejun
c1642123fd media: rockchip: ispp: adjust interface struct to speed cpu access 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I831829066ed2d8862cd76bab3b00cd9219f8018b
 2020-05-25 18:20:00 +08:00
Cai YiWei
e980b4f14d media: rockchip: ispp: add more format and module control 
Change-Id: I982d4d8529ac2b55dc4a695456554f6ca7c4985c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:20:00 +08:00
Hu Kejun
758952fbac media: rockchip: ispp: fix some iq params error 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ib45a8ee9588406bb049944787d9c64fedc84dd04
 2020-05-25 18:20:00 +08:00
Cai YiWei
242510a98e media: v4l: add rockchip fbc format 
Change-Id: I0dd89290f23c412d4656583f554e220af66f9704
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:59 +08:00
Cai YiWei
998e9cd43f media: rockchip: isp: add csi tx/rx memory mode API 
Change-Id: I289b1c57889e65d5220462d9509f96287b3fb81a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:57 +08:00
Cai YiWei
6109c9a423 media: rockchip: isp: add read back frame id 
read back frame id to sync frame isp input and output

Change-Id: I739cdf04d8a9f1efa8c70e818329ae80ad606a90
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:57 +08:00
Hu Kejun
47984bb964 media: rockchip: isp: add other iq config function 
Change-Id: I79d6aab382eb79489f0aee19812233b34f012b72
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
 2020-05-25 18:19:57 +08:00
Hu Kejun
45fd20585f media: rockchip: isp: support get y statics from csirx 
Change-Id: I7a69c63c8b42b1144a82e7efdd12b176e3b2090c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:57 +08:00
Cai YiWei
b59278f203 media: rockchip: ispp: init ispp 
Change-Id: I20a6eee6157eccee6ac117b561a472474ce36b9f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:54 +08:00
Cai YiWei
a1473fa729 media: rockchip: isp: add isp2.0 rawrd read back API 
Change-Id: I0ffab0e90b3eaebfad949826eee8601f80e01caf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:52 +08:00
Cai YiWei
e631e47fe7 media: rockchip: isp: support 3a part of isp2.0 
Change-Id: I5650286494b09e9d0dbda651d84761327621de11
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:52 +08:00
Cai YiWei
8d2efa7f5e media: rockchip: isp: init isp2.0 
Change-Id: Ia22c5eefc931280dca77201dea420aff622f1e82
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2020-05-25 18:19:51 +08:00
Zeng Tao
66cb0608ac FROMLIST: usb: gadget: uvc: configfs: add framebased format support 
As we know, The framebased format can be used to support a lot of
formats other than YUV and MJPEG, for example: H264 or H265.
And Nowadays, the H264 and H265 is used more and more compared to the
MJPEG, so there is a need to support such usecase, although the new UVC
1.5 and the UVC1.1 extensions already support H264, but they are much
more expensive and most of the time, what we need is just a channel to
stream the video frames.

In this patch, we implement the framebased format and set it to H264 by
default, and the users could change the video format as they need through
the guid configfs attribute node.

Change-Id: Ie1c62f5fb4fa57c24a2878f9992c982e9deb302e
Signed-off-by: Zeng Tao <prime.zeng@hisilicon.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(am from https://patchwork.kernel.org/patch/10722957/)
 2020-04-08 11:45:11 +08:00
Sandy Huang
4492caa259 drm/modes: add dclk invert config parse 
Change-Id: I386159201bc44f02c3aa6862f222910c801cfbac
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2020-04-01 16:39:59 +08:00
Tao Huang
06a7fcfc9a Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common 
* android-4.19: (1190 commits)
  ANDROID: update the ABI xml representation
  ANDROID: GKI: Enable V4L2 hidden configs
  ANDROID: GKI: Enable CONFIG_BACKLIGHT_CLASS_DEVICE in gki_defconfig
  ANDROID: Incremental fs: Add INCFS_IOC_PERMIT_FILL
  ANDROID: Incremental fs: Remove signature checks from kernel
  ANDROID: Incremental fs: Pad hash blocks
  ANDROID: Incremental fs: Make fill block an ioctl
  ANDROID: Incremental fs: Remove all access_ok checks
  Linux 4.19.111
  batman-adv: Avoid free/alloc race when handling OGM2 buffer
  efi: Add a sanity check to efivar_store_raw()
  net/smc: cancel event worker during device removal
  net/smc: check for valid ib_client_data
  ipv6: restrict IPV6_ADDRFORM operation
  i2c: acpi: put device when verifying client fails
  iommu/vt-d: Ignore devices with out-of-spec domain number
  iommu/vt-d: Fix the wrong printing in RHSA parsing
  netfilter: nft_tunnel: add missing attribute validation for tunnels
  netfilter: nft_payload: add missing attribute validation for payload csum flags
  netfilter: cthelper: add missing attribute validation for cthelper
  ...

Conflicts:
	arch/arm64/configs/gki_defconfig
	arch/x86/configs/gki_defconfig
	drivers/devfreq/Kconfig
	drivers/dma-buf/dma-buf.c
	include/linux/usb/quirks.h
	kernel/sched/topology.c

Change-Id: Ibd305c952c16c253b34d822cf68c03f9ff5be7b3
 2020-03-21 19:46:46 +08:00
Paul Lawrence
1530be50af ANDROID: Incremental fs: Add INCFS_IOC_PERMIT_FILL 
Provide a securable way to open a file for filling

Test: incfs_test passes
Bug: 138149732
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: Ib4b6fd839ad30ce08e31121d19e2c0d7066d302f
 2020-03-18 09:57:55 -07:00
Paul Lawrence
73e7d65693 ANDROID: Incremental fs: Remove signature checks from kernel 
Test: selftests pass
Bug: 133435829
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: Ia7e69b1b0176202da4b418ea815b370cbdacd5c2
 2020-03-18 09:57:55 -07:00
Paul Lawrence
70539f7cfd ANDROID: Incremental fs: Make fill block an ioctl 
Filling blocks is not equivalent to writing a file, since they are
constrained by the root hash. selinux policy may wish to treat them
differently, for instance.

Test: incfs_test passes
Bug: 138149732
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: Ic369b84b92547b1cfefe422bd881c4e466090aed
 2020-03-18 09:57:54 -07:00
Swathi Sridhar
80933739d5 ANDROID: GKI: dma-buf: Add support for XXX_cpu_access_umapped ops 
Userspace clients will be able to restrict cache maintenance to only
the subset of the dma-buf which is mmap(ed) by setting the
DMA_BUF_SYNC_USER_MAPPED flag when calling the DMA_BUF_IOCTL_SYNC IOCT.

Signed-off-by: Swathi Sridhar <swatsrid@codeaurora.org>

Bug: 150611569
Test: build
(cherry-picked from bbbc80b6d8b75ffea6a0eb1f53ab503ccf0011f1)
[surenb: partial cherry-pick from
bbbc80b6d8b7 ion : Merge ion changes from ...
to resolve ABI diffs caused by {begin/end}_cpu_access_umapped
dma_buf_ops.
changed dma_buf_end_cpu_access_umapped to be static.]
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ic2029c5218ca99330a0e7e6128e12ac29cdd1c08
 2020-03-16 18:13:07 +00:00