Commit Graph

1066174 Commits

Author SHA1 Message Date
Simon Xue
2496c014e1 arm64: dts: rockchip: rk3588s: add php_grf for PCIe
Change-Id: I52e9f49b85f3881d654e727c2299c6dc31fd9530
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-22 11:33:17 +08:00
Simon Xue
f52f348039 arm64: dts: rockchip: rk3588: add php_grf for PCIe
Change-Id: Id3dee374794c41be59db088016702e420b1223be
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-22 11:33:17 +08:00
Cai YiWei
9b603198a7 media: rockchip: isp: bigmode by max width and size for isp30
bigmode depend on width > 2688 or size > 2688x1536.
cac mesh buf0 apply to no bigmode, buf1 apply to bigmode.

Change-Id: Iba8120e2076e8677ba176080adf587ab9575ab30
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:53:58 +08:00
Cai YiWei
789b662b47 media: rockchip: isp: fix rawhist weight config error for multi deivce
rawhist weight reg will be automatically incremented by each write.

Change-Id: I531d8a03dda804039237d3400d77127b070c11e9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:53:23 +08:00
Cai YiWei
8c8d544883 media: rockchip: isp: fix ynr/cnr/baynr reg config
reg write and readback is shoadow, no effective immediately,
so change to get reg ddr value.

Change-Id: I2a13551617f944870dd71bcec666ee8067757cdf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:51:12 +08:00
Cai YiWei
8230e776cd media: rockchip: isp: fix first params config two times for readback mode
Change-Id: Ia6209e60fc75a039ca06d1aa0d5d64e4c9515b9e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:51:12 +08:00
Elaine Zhang
dde2f927c2 clk: rockchip: rk3588: support npll/aupll/v0pll power down by auto
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ida2f113f6989eb9db9d97522514299d4660bbb69
2021-11-22 10:41:33 +08:00
Wyon Bi
4074c7cc38 arm64: dts: rockchip: Add RK3588 EVB2 LP4 V10 eDP Board
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ie3896cf8981a2246f188a6f4411d9acc49f290cb
2021-11-22 09:20:51 +08:00
Algea Cao
9dce04812e drm/rockchip: vop2: Only do clk_round_rate check when dclk <= max_dclk in vop2_crtc_mode_valid
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Iec81ed9e4ca9bb253ee65b4a92d788b7f88077b3
2021-11-21 16:55:45 +08:00
Guochun Huang
5a24f1e34c arm64: dts: rockchip: rk3588-evb2: fix backlight pwm pinctrl
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I6a98544290d14e371b60e00e2588b29d554eb604
2021-11-21 16:12:31 +08:00
Andy Yan
4f5250b100 drm/rockchip: vop2: Check internal cru div width
Make sure the div we set is not out of max div.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ifa9a94e519894da340a91bbbd339c9d01b14104c
2021-11-21 16:03:06 +08:00
Andy Yan
47a1e8c992 drm/rockchip: vop2: Only do clk_round_rate check when dclk <= max_dclk
The Current max vop_dclk if 600MHZ on all rockchip soc.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I497fc14e89bcbaf4e6aa44fc36bc7fc93ac45aed
2021-11-21 15:48:30 +08:00
Wyon Bi
b3e060dc22 usb: typec: altmodes: displayport: Fix pin assignment
Fix pin-assignment as per specification.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Iad7e211e43ebc01607ae534b56666ec56da2f54b
2021-11-19 19:27:27 +08:00
Lian Xu
2b9e09ee41 arm64: rockchip_defconfig: Enable CONFIG_VIDEO_ROCKCHIP_ISPP
Change-Id: Ib85251201fa1a2745ef849490007f921eb1442ad
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2021-11-19 19:21:12 +08:00
Lian Xu
ba218386ca arm64: rockchip_gki.config: Enable CONFIG_VIDEO_ROCKCHIP_ISPP
Change-Id: I351be8aacbc6f8e69de1c2f4d9edf2a21583be64
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2021-11-19 19:21:04 +08:00
Lian Xu
40528b572c arm64: rockchip_linux_defconfig.config: Enable CONFIG_VIDEO_ROCKCHIP_ISPP
Change-Id: I894c8d1fa57bbe0fdfa0907d9fa6c4070eb4e0da
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2021-11-19 19:20:54 +08:00
Shaoxing Chen
c27a36a71e arm64: dts: rockchip: fix touch gpio for rk3588-evb4
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: Iceebcdd6b8c2f59c63f56de8ed3c862acc225d90
2021-11-19 18:37:06 +08:00
Wu Liangqing
ca0399cbf4 arm64: dts: rockchip: rk3588s-tablet: sdhci enabled hs400 add tsadc
and rkvdec/rkvenc

Change-Id: Iaf30b749510864360968e51b6612326b2208ec8d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-11-19 18:19:40 +08:00
Damon Ding
e4065cd42c arm64: dts: rockchip: rk3588: add rgb node
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I962f1d03f1d5d0ae44e5973416c4d1085f34b010
2021-11-19 18:18:46 +08:00
Damon Ding
0a2cc9f274 drm/rockchip: rgb: add rk3588 of_device_id
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I03c4fcc6383b86def46fc696772fc760b3c5c8ea
2021-11-19 18:17:55 +08:00
Guochun Huang
422c7cfa33 phy: rockchip: mipi-dcphy: modify dcphy internal address mapping
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ic7da123f8e827fdc151748aba13ea008307bbebf
2021-11-19 18:15:02 +08:00
Wyon Bi
3ce8a83106 drm/rockchip: vop2: Move vop2_crtc_mode_valid to drm_crtc_helper_funcs
This function is inherit from linux-4.4, only connector
has mode_valid callback at that age, so we should tie
it to rockchip_crtc_funcs and called by connector driver.

Now drm_crtc_helper_funcs has a mode_valid callback,
so we can tie it here and called by drm framework.

This make connector driver simple.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib15906d8ab54907c20811e3ac9c531f7113c20c3
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-11-19 17:14:26 +08:00
Elaine Zhang
fd00e36819 clk: rockchip: rk3588: fix up the usbdpphy_mipidcpphy register error
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I645d29bb87f39df4c5d76e514fbff45548ec5330
2021-11-19 17:11:27 +08:00
Simon Xue
1455f37b24 iio: adc: rockchip_saradc: fix RK3588 saradc panic
RK3588 saradc will usleep before start, so if start call
from timer will panic. fix it by using delayed_work instead.

Change-Id: I7f98266659f5f2d8968a901bd6423efaa50839b5
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-19 16:15:19 +08:00
Ding Wei
6c07ecb13b video: rockchip: mpp: rkvenc2: Fix issue for the range of SQI
Change-Id: Idddba7afb7b5e1b7875e880d72889fa4c945927e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-19 11:22:18 +08:00
William Wu
b313e1bd31 phy: rockchip: usbdp-phy: fix wait pll lock timeout
Current the LCPLL/CDR/ROPLL lock timeout (600us) is too short,
change timeout to 100ms refer to the usbdp phy of exynos.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ia88206f32d0e2ab1288a12f5f64d654bf6d24311
2021-11-19 11:08:43 +08:00
Shawn Lin
bf5a9c0126 PCIe: rockchip: Fix uninitialized lock
intx_lock should be initialized before use.

Fixes: ee99fe07a7 ("PCIe: rockchip:  Add more legacy int support")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I39586ae4f8edc1c39d78ce95af29f24bfc46b4d4
2021-11-19 09:54:58 +08:00
zhengding chen
00d29953bb ANDROID: GKI: Update symbols to symbol list
Update symbols to symbol list externed by oem modules.

Leaf changes summary: 6 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 3 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 3 Added variables

3 Added functions:

  [A] 'function int __traceiter_android_vh_binder_del_ref(void*, task_struct*, uint32_t)'
  [A] 'function int __traceiter_android_vh_binder_new_ref(void*, task_struct*, uint32_t, int)'
  [A] 'function int __traceiter_android_vh_binder_proc_transaction(void*, task_struct*, task_struct*, task_struct*, int, unsigned int, bool)'

3 Added variables:

  [A] 'tracepoint __tracepoint_android_vh_binder_del_ref'
  [A] 'tracepoint __tracepoint_android_vh_binder_new_ref'
  [A] 'tracepoint __tracepoint_android_vh_binder_proc_transaction'

Bug: 193384408
Signed-off-by: zhengding chen <chenzhengding@oppo.com>
Change-Id: Ia8b4c3bf3847dd3e61a82bd11765439fcc2bfbf1
2021-11-19 01:42:40 +00:00
Jon Lin
ca9e80a44a arm64: dts: rockchip: rk3588s-evb3-lp4x: Fix pcie1l2 configuration
Change-Id: I5535bf887b5d0f84c82c0459dcd834d8980195e2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-11-19 09:31:43 +08:00
Pavankumar Kondeti
7a069c6071 FROMGIT: usb: gadget: f_fs: Use stream_open() for endpoint files
Function fs endpoint file operations are synchronized via an interruptible
mutex wait. However we see threads that do ep file operations concurrently
are getting blocked for the mutex lock in __fdget_pos(). This is an
uninterruptible wait and we see hung task warnings and kernel panic
if hung_task_panic systcl is enabled if host does not send/receive
the data for long time.

The reason for threads getting blocked in __fdget_pos() is due to
the file position protection introduced by the commit 9c225f2655
("vfs: atomic f_pos accesses as per POSIX"). Since function fs
endpoint files does not have the notion of the file position, switch
to the stream mode. This will bypass the file position mutex and
threads will be blocked in interruptible state for the function fs
mutex.

It should not affects user space as we are only changing the task state
changes the task state from UNINTERRUPTIBLE to INTERRUPTIBLE while waiting
for the USB transfers to be finished. However there is a slight change to
the O_NONBLOCK behavior. Earlier threads that are using O_NONBLOCK are also
getting blocked inside fdget_pos(). Now they reach to function fs and error
code is returned. The non blocking behavior is actually honoured now.

Reviewed-by: John Keeping <john@metanate.com>
Signed-off-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
Link: https://lore.kernel.org/r/1636712682-1226-1-git-send-email-quic_pkondeti@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit c76ef96fc0
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next)
Bug: 206906138
Change-Id: Ifb99336a4da7587c7e71a6c45999a36948194d7a
Signed-off-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
2021-11-18 16:09:37 +00:00
Wangqiang Guo
b3390628ad input: touchscreen: elan5515 touch problem resolved
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I4304be2340be8c2d4d290301b52b661b7a5ee64f
2021-11-18 20:37:32 +08:00
Guochun Huang
0b49a6a26e arm64: dts: rockchip: rk3588s-evb1/4: add mipi_te for cmd panel
In command mode systems, the display notifies the host through a TE
signaling whenever it reaches a specific scanline. This action allows
the host to know when to update the display GRAM without causing a
tearing effect.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I24d660e411a5bdf6041bfad9281135ab74d05ecc
2021-11-18 20:28:37 +08:00
Guochun Huang
bcf63f6d07 arm64: dts: rockchip: rk3588s-evb1: delay some time for each dsi cmd packet
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I99ef5b5917f4b273523277ba7d19de528d922a00
2021-11-18 20:27:49 +08:00
Guochun Huang
b4ede813b8 drm/rockchip: dsi2: fix unblance pm call
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ibdf0d0ae44e422fc344305deec1883a37666141b
2021-11-18 20:27:15 +08:00
Sandy Huang
0d3838a66d drm/rockchip: vop2: correctly rgb output mode
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I95353627903b0673c4c3afe7c891f63932e77c81
2021-11-18 20:21:04 +08:00
Huang zhibao
7ea8091741 arm64: dts: rockchip: rk3588-nvr-demo: update es8311 config
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I7cb3a5b7090fbb5e4095c5e3f0cf8bb479adc119
2021-11-18 20:18:06 +08:00
Huang zhibao
d49dbe6291 arm64: dts: rockchip: rk3588-nvr: Add hdmi sound for nvr demo
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I9527e167cb613000f2d195197218a2996afa1957
2021-11-18 20:18:06 +08:00
Wyon Bi
05ac65fc85 drm/rockchip: dw-dp: Fix link training issues
- Improve link training code
- Add link retrain logic
- Reject modes that exceed the maximum bandwidth

Fixes: 9548fbb10c ("drm/rockchip: Add support for Synopsys DesignWare Cores DPTX")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I135a62587b71a4c237407db6899486ff93124a90
2021-11-18 20:17:12 +08:00
Wyon Bi
bb6015af1d arm64: dts: rockchip: rk3588-evb1-lp4: Fix dp2vga display
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib764a9cc64d38e1e3d1e66da03796c31d324391e
2021-11-18 20:09:57 +08:00
Lin Jinhan
485249fbdb arm64: dts: rockchip: enable rng for rk3588-android and rk3588-linux
Enable rng node in files below:
1. rk3588-linux.dtsi
2. rk3588-android.dtsi

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I767cd0fac35af5b840cb7856477b70aa00f71ada
2021-11-18 20:02:04 +08:00
Lin Jinhan
7202944523 hwrng: rockchip: add trng v1 support
Use "rockchip,trngv1" as compatible, first supported in RK3588.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Ifa9637a64ceae1e7fd5478832b768838e43d460b
2021-11-18 19:59:18 +08:00
Zefa Chen
60969b9366 media: i2c: otp_eeprom fixed err for rkmodule v2
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie4beb9d2c9d6c6bb4288a5b911f56fcb48c22448
2021-11-18 19:31:02 +08:00
Andy Yan
726017167f drm/rockchip: vop2: Default give primary plane the lower zpos
Linux app always use the default zpos, and they thought:
Primary plane zpos < overlay plane zpos < cursor plane zpos.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I5d10be4c4a6463248a80fb2e3f6ff27e8b3cc414
2021-11-18 19:05:41 +08:00
Sugar Zhang
b1662f1291 drm/bridge: synopsys: Add audio support for dw-hdmi-qp
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I41ceead79d46e08d5022bc1cc536af89437003a3
2021-11-18 16:55:24 +08:00
Zefa Chen
17517804c1 media: rockchip: cif fixed err when get vc fail
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib7a6158dfaafbca49ac8df6374c708be9926814e
2021-11-18 16:30:02 +08:00
Zefa Chen
249c2f83a6 include: uapi/linux/rk_vcm_head.h update to v0.2.0
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I07fbfd6f0c18845ae6d3557a5746b95aa7c96dbd
2021-11-18 16:29:07 +08:00
Hu Kejun
6ae690bfe7 media: spi: ms41908: zoom/focus use different reback value
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I62ad6560bfd5aeb672aed2e5352bdacc68fd75f7
2021-11-18 16:26:51 +08:00
Zefa Chen
cb725a0f14 include: update uapi/linux/rk_vcm_head.h
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3c2f9b6d0bcc59945af3d1383ffc56604b4276e1
2021-11-18 16:24:36 +08:00
Yang Yang
d30938528e ANDROID: GKI: Update symbol list for VIVO
Leaf changes summary: 18 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 9 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 9 Added variables

9 Added functions:

  [A] 'function int __traceiter_block_bio_complete(void*, request_queue*, bio*)'
  [A] 'function int __traceiter_block_bio_queue(void*, request_queue*, bio*)'
  [A] 'function int __traceiter_block_getrq(void*, request_queue*, bio*, int)'
  [A] 'function int __traceiter_block_rq_complete(void*, request*, int, unsigned int)'
  [A] 'function int __traceiter_block_rq_insert(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_rq_issue(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_rq_merge(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_rq_requeue(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_split(void*, request_queue*, bio*, unsigned int)'

9 Added variables:

  [A] 'tracepoint __tracepoint_block_bio_complete'
  [A] 'tracepoint __tracepoint_block_bio_queue'
  [A] 'tracepoint __tracepoint_block_getrq'
  [A] 'tracepoint __tracepoint_block_rq_complete'
  [A] 'tracepoint __tracepoint_block_rq_insert'
  [A] 'tracepoint __tracepoint_block_rq_issue'
  [A] 'tracepoint __tracepoint_block_rq_merge'
  [A] 'tracepoint __tracepoint_block_rq_requeue'
  [A] 'tracepoint __tracepoint_block_split'

Bug: 206557432
Change-Id: I0441bbc9f88dbccb410dfd6b21c7dfb3891e49c4
Signed-off-by: Yang Yang <yang.yang@vivo.com>
2021-11-18 08:19:33 +00:00
Yang Yang
47458bf124 ANDROID: block: export tracepoints
This patch will export some tracepoints so that vendor modules can use them.
Export these tracepoint functions to track IO data flow for performance tuning.

Bug: 205648026
Change-Id: Ia37b8f99b2d940cecce46c8bc24f724c14450517
Signed-off-by: Yang Yang <yang.yang@vivo.com>
2021-11-18 08:19:22 +00:00