Commit Graph

1271883 Commits

Author SHA1 Message Date
Sandy Huang
d3b6fbf3c0 drm/rockchip: vop: remove no need locked check at load lut
Fix the following warning:
[   12.265470] ------------[ cut here ]------------
[   12.265488] WARNING: CPU: 2 PID: 196 at
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3454
vop2_crtc_load_lut+0x444/0x4c0
[   12.265490] Modules linked in:
[   12.265498] CPU: 2 PID: 196 Comm: kworker/u16:4 Not tainted 5.10.198
[   12.265500] Hardware name: Rockchip RK3588S RT-ICS WED 23588S V11
Board (DT)
[   12.265506] Workqueue: events_unbound commit_work
[   12.265511] pstate: 40c00009 (nZcv daif +PAN +UAO -TCO BTYPE=--)
[   12.265515] pc : vop2_crtc_load_lut+0x444/0x4c0
[   12.265518] lr : vop2_crtc_load_lut+0x44/0x4c0
[   12.265520] sp : ffffffc00adb3bd0
[   12.265522] x29: ffffffc00adb3bd0 x28: ffffffc00961a1a0
[   12.265526] x27: ffffff8107a52000 x26: ffffff81026f0080
[   12.265531] x25: ffffff8107a51c00 x24: ffffff81026f54a8
[   12.265536] x23: ffffff8107a51c00 x22: ffffff81026f0080
[   12.265540] x21: ffffff81026f5080 x20: ffffff81026f0080
[   12.265544] x19: ffffff81026f13b8 x18: 0000000000000030
[   12.265548] x17: 0000000000000182 x16: 0000000000000018
[   12.265552] x15: ffffffffffffffff x14: 0000000000000438
[   12.265557] x13: 0000000000201834 x12: 0000000004000201
[   12.265561] x11: 0000000000000011 x10: 0000000000000001
[   12.265565] x9 : ffffffc00887e0e4 x8 : ffffff8144dcc058
[   12.265569] x7 : 0000000080008001 x6 : 00000000000003ff
[   12.265573] x5 : ffffff81026ae080 x4 : 0000000000000400
[   12.265577] x3 : 0000000000000400 x2 : 00000000000003ff
[   12.265581] x1 : 00000000000003ff x0 : 0000000000000000
[   12.265586] Call trace:
[   12.265590]  vop2_crtc_load_lut+0x444/0x4c0
[   12.265594]  vop2_crtc_atomic_flush+0x790/0x2200
[   12.265598]  drm_atomic_helper_commit_planes+0x158/0x214
[   12.265601]  rockchip_drm_atomic_helper_commit_tail_rpm+0xf0/0x1b0
[   12.265604]  commit_tail+0xa8/0x17c
[   12.265607]  commit_work+0x1c/0x30
[   12.265612]  process_one_work+0x20c/0x49c
[   12.265614]  worker_thread+0x1a0/0x534
[   12.265617]  kthread+0x130/0x134
[   12.265621]  ret_from_fork+0x10/0x34

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I5d7d9b0a2eb7331441d4ef0f84b8333ba6c6d855
2024-06-06 11:14:37 +08:00
Sandy Huang
808adcf967 drm/rockchip: vop2: remove no need locked check at load lut
Fix the following warning:
[   12.265470] ------------[ cut here ]------------
[   12.265488] WARNING: CPU: 2 PID: 196 at
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3454
vop2_crtc_load_lut+0x444/0x4c0
[   12.265490] Modules linked in:
[   12.265498] CPU: 2 PID: 196 Comm: kworker/u16:4 Not tainted 5.10.198
[   12.265500] Hardware name: Rockchip RK3588S RT-ICS WED 23588S V11
Board (DT)
[   12.265506] Workqueue: events_unbound commit_work
[   12.265511] pstate: 40c00009 (nZcv daif +PAN +UAO -TCO BTYPE=--)
[   12.265515] pc : vop2_crtc_load_lut+0x444/0x4c0
[   12.265518] lr : vop2_crtc_load_lut+0x44/0x4c0
[   12.265520] sp : ffffffc00adb3bd0
[   12.265522] x29: ffffffc00adb3bd0 x28: ffffffc00961a1a0
[   12.265526] x27: ffffff8107a52000 x26: ffffff81026f0080
[   12.265531] x25: ffffff8107a51c00 x24: ffffff81026f54a8
[   12.265536] x23: ffffff8107a51c00 x22: ffffff81026f0080
[   12.265540] x21: ffffff81026f5080 x20: ffffff81026f0080
[   12.265544] x19: ffffff81026f13b8 x18: 0000000000000030
[   12.265548] x17: 0000000000000182 x16: 0000000000000018
[   12.265552] x15: ffffffffffffffff x14: 0000000000000438
[   12.265557] x13: 0000000000201834 x12: 0000000004000201
[   12.265561] x11: 0000000000000011 x10: 0000000000000001
[   12.265565] x9 : ffffffc00887e0e4 x8 : ffffff8144dcc058
[   12.265569] x7 : 0000000080008001 x6 : 00000000000003ff
[   12.265573] x5 : ffffff81026ae080 x4 : 0000000000000400
[   12.265577] x3 : 0000000000000400 x2 : 00000000000003ff
[   12.265581] x1 : 00000000000003ff x0 : 0000000000000000
[   12.265586] Call trace:
[   12.265590]  vop2_crtc_load_lut+0x444/0x4c0
[   12.265594]  vop2_crtc_atomic_flush+0x790/0x2200
[   12.265598]  drm_atomic_helper_commit_planes+0x158/0x214
[   12.265601]  rockchip_drm_atomic_helper_commit_tail_rpm+0xf0/0x1b0
[   12.265604]  commit_tail+0xa8/0x17c
[   12.265607]  commit_work+0x1c/0x30
[   12.265612]  process_one_work+0x20c/0x49c
[   12.265614]  worker_thread+0x1a0/0x534
[   12.265617]  kthread+0x130/0x134
[   12.265621]  ret_from_fork+0x10/0x34

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3e7fc89598f45b88d4a6e1de0e2771f89936fe7a
2024-06-06 11:05:14 +08:00
Cai Wenzhong
a1b63a3c9b media: i2c: maxim: remote: os04a10: fix kernel-6.1 compile error
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Icd2a15b4e8f8f838aaadc62d82b3aa223f9dc0d2
2024-06-06 10:34:10 +08:00
Alex Wang
31cd4f11b5 input: rockchip_pwm_remotectl: support pwm shutdown
Change-Id: I71f70a2f24958ffa2048f18220dc19ea42bfd818
Signed-off-by: Alex Wang <alex.wang@rock-chips.com>
2024-06-06 10:30:59 +08:00
Zhang Yubing
7fc20e2dfe drm/rockchip: dw-dp: support fix virtual channel payload id
For simulation aux client, the virtual channel pyaload id can't
send by sideband MSG. In this case, the MST device often config
a fix payload id. It need DPTX also config fix payload id to
match the MST device.

Change-Id: I49148e92a80091a50a5b1f44496430f39d9c1aee
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2024-06-06 10:27:39 +08:00
Zhang Yubing
82e9773633 drm/rockchip: dw-dp: support user simulate aux for sideband message
Change-Id: I23be5e753ac650fe08afe42819ebe4e55a8cf708
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2024-06-06 10:27:39 +08:00
Zhang Yubing
33c51f42c4 drm/rockchip: dp-mst-sim: support mst device without aux client
some MST-capable device may not support Messaging AUX Client.
In this case, sideband MSG can't be transferred between DPTX
and the MST device. A solution is to simulate a Messaging AUX
client in MST device side to deal with sideband MSG.

Change-Id: I7c68f6d0bd88501c4e19097e3a1f9a9fabcf2698
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2024-06-06 10:25:08 +08:00
Zhang Yubing
675c592033 arm64: configs: rockchip_linux_defconfig: enable CONFIG_ROCKCHIP_DP_MST_AUX_CLIENT
Change-Id: If1070103e6b0468456d8c480a73c0315095a3b59
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2024-06-06 10:24:24 +08:00
Sugar Zhang
56d2082cec ASoC: rockchip: multi-dais: Workaround for interleaved for GKI
Once upstream is merged, this patch can be dropped.
also for line CONFIG_NO_GKI

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I83f5a08e93010741c26ec044f70b388a50e6c7a9
2024-06-06 10:10:28 +08:00
Sugar Zhang
f48e683a54 dmaengine: pl330: Workaround for interleaved for GKI
Once upstream is merged, this patch can be dropped.
also for line CONFIG_NO_GKI

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2b0fc69aa6673e46dcd65e0369ab4353e7c4f9fc
2024-06-06 10:10:28 +08:00
Zheng zhiqi
9aba6831dd arm64: dts: rockchip: rk3576-vehiclke-evb: use vehicle sound
1. open spi1 dev
2. change spi codec to dummy codec
3. remove es8388 sound

This patch keeps the vehicle sound to be "car-rk3308-sound" since the
audio HAL use it fixed.

Change-Id: I6a968e09f548cffa64088bfba0c7c266f3727146
Signed-off-by: Zheng zhiqi <looper.zheng@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2024-06-06 09:27:49 +08:00
Chandler Chen
dcaa39ee96 video: rockchip: mpp: fix unused buffer move fail issue
When dmabuf cache disable:
1.move most recently used link node to link tail,
instead of calculate oldest ktime when buffer full.
2.For those buffer import by ioctl MPP_CMD_TRANS_FD_TO_IOVA,
move to static_list instead of used_list,
and don't increase extra kref,
so that it will release when user space call
ioctl MPP_CMD_RELEASE_FD.

Change-Id: I38f209c24f6cc7e831338e2417050e3ef39226f9
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
2024-06-06 09:26:35 +08:00
Elaine Zhang
a52d69153e arm64: dts: rockchip: rk3576: set aclk_php to 250M by default
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I5c0277bbc2f7583df5a93ec72d87b7c103ade20e
2024-06-06 09:23:27 +08:00
Finley Xiao
a77252e2b5 arm64: dts: rockchip: rk3576: Add vop-bw-dmc-level for dmc
Change-Id: I37fddb3595bee2192e5f57efe19c722b982f79d6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2024-06-05 18:52:07 +08:00
Finley Xiao
7ee4b8fe83 PM / devfreq: rockchip_dmc: Add bandwidth level table support
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3fcc4b9454c599f7a5946a61893153171509de42
2024-06-05 18:52:07 +08:00
Cai Wenzhong
682affbb83 arm64: dts: rockchip: rk3588-vehicle-serdes-mfd-display-rohm.dtsi: fix i2c7 and i2c8 are disabled error
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I3880ad24f7cf86812b13ae984f6adb582b106a0d
2024-06-05 09:23:33 +08:00
Cai Wenzhong
7ea19b17ea arm64: dts: rockchip: rk3588-vehicle-evb-v22: fix dcphy1 gpio conflict with backlight
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Idb7b753eb71a0bf22224ee11b5d1aeb72d1ec642
2024-06-05 09:23:33 +08:00
Cai Wenzhong
411f3d4622 arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max96712-dphy3-os04a10.dtsi: enable multi-raw
enable multiple raw sensor link to isp depend on config MULTI_SENSOR_LINK_TO_ISP

Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I52a0ca4f1c6cb26a43c95b5d3a41df2b4f351ad4
2024-06-05 09:23:33 +08:00
Cai Wenzhong
88c54416a3 arm64: dts: rockchip: add rk3588-vehicle-evb-maxim-max96712-dphy3-os04a10.dtsi
1. 2Lanes and 4Lanes: 2688 * 1520, RAW10, 30fps, MCLK = 24MHz
2. Data Lanes config depend on REMOTE_SENSOR_2_DATA_LANES
3. Default enable 2Lanes for improving bandwidth utilization

Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I341ca54f6231e02c7deb7b77a7c6f74d5e37c7c9
2024-06-05 09:23:33 +08:00
Cai Wenzhong
8818afdfc1 arm64: configs: rk3588_vehicle.config: add CONFIG_VIDEO_MAXIM_CAM_OS04A10=y
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I173934018fd452da380d72f43c94002288585293
2024-06-05 09:22:33 +08:00
Cai Wenzhong
1831c9c25d media: i2c: maxim: remote: add omnivision os04a10 sensor driver
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Icc764fab0cce3b1df7c114a132585a35aef48a33
2024-06-05 09:19:08 +08:00
Cai Wenzhong
099d24c61c media: i2c: maxim: driver version v3.04.00
Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I313dfc73d4b43a7315f9ac87c03e6794742d9a0b
2024-06-05 09:18:56 +08:00
Yiqing Zeng
1ebca99c8f media: i2c: maxim4c: support subscribe hot plug detect event
Change-Id: Ia646b37a323885f54bedefa1b3bfcc3b7c642b0f
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
2024-06-04 20:45:58 +08:00
Guochun Huang
c5be1bded8 drm/rockchip: dsi2: add support PSR for mipi command mode
As described in:
https://patchwork.freedesktop.org/patch/msgid/20190228210939.83386-2-sean@poorly.run

From the driver's perspective, this works like a regular disable/enable
cycle. The driver need only check the 'psr_transition' state in
connector_state and keep the panel turned on when in .disable(), while
everything else will cycle off as normal. If drivers want more control,
they can use the psr_transition state to enter a low-power state to
minimize PSR exit time.

While this carries the PSR moniker, it is not specific to the
DisplayPort technology. This can be used for power savings
with other types of self refresh, such as MIPI command mode.

Change-Id: I80799c7f1356645e50dae98159591dde6aa5abff
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2024-06-04 20:45:02 +08:00
Guochun Huang
e50eabf923 drm/rockchip: dsi2: set phy mode in .loader_protect helper
if the mode of the PHY is not set in .loader_protect helper,
when entering sleep mode for the first time bring up with
display logo, the PHY will not be able to shut down completely
and accurately because it does not know in which mode it is
operating, resulting in some power consumption.

Change-Id: If5606c24fd2a542936cdb2f1c3d4e380d6c3889a
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2024-06-04 20:45:02 +08:00
Zhang Yubing
c8094ce9fd drm/rockchip: dw-dp: support external bridge
Change-Id: Ic04fdec4c4559851124fe6a205c8442c120e146d
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2024-06-04 20:37:58 +08:00
Zhang Yubing
793f858ef2 drm/rockchip: dw-dp: support fix stream and connector
The DP Port may attach a DP MST bridge device as follow:
+-------------------------+      +---------------------------------+
|                         |      |                                 |
|           +---------+   |      |                   +-------------+
|           |         |   |      |                   |             |
|           | stream0 |   |      |                   | Output Port1|
|           |         |   |      |                   |             |
|           +---------+   |      |                   +-------------+
|                         |      |                                 |
|                         |      |                                 |
|           +---------+   |      +-------------+     +-------------+
|           |         |   |      |             |     |             |
| DP Port   | stream1 |   +------> Input Port0 |     | Output Port2|
|           |         |   |      |             |     |             |
|           +---------+   |      +-------------+     +-------------+
|                         |      |                                 |
|                         |      |                                 |
|           +---------+   |      |                   +-------------+
|           |         |   |      |                   |             |
|           | stream2 |   |      |                   | Output Port3|
|           |         |   |      |                   |             |
|           +---------+   |      |                   +-------------+
|                         |      |     DP MST Bridge               |
+-------------------------+      +---------------------------------+
The DP MST bridge device may be a branch device, such as DP
MST HUB, the branch unit in DP MST monitor, A DP MST bridge
chip and so on.

When a sink device connected to the DP MST bridege device's
output port, The sink device may receive the stream from
steram0/1/2.

When the DP MST bridge device is a bridge chip and the output
port attach to a fixed device(another bridge device or panel).
The output port may want bind itself to a fixed stream.

To satisfy this requirement, The prop
"rockchip,mst-fixed-ports" is used to do it.
For example, define as follow:
rockchip,mst-fixed-ports = <1 2 3>;
It mean that:
DP Port stream0 --> DP MST bridge Output Port1
DP Port stream1 --> DP MST bridge Output Port2
DP Port stream2 --> DP MST bridge Output Port3

Change-Id: I91dfc51a5e8a533ebbabdcae572163907ec2c9fe
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2024-06-04 20:37:58 +08:00
Zhibin Huang
3220dcb643 phy: rockchip: mipi-dcphy: optimize signal
Type: Fix
Redmine ID: #487592
Associated modifications: N/A
Test: N/A

Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: I35143b35c06a9460f45016b4eb24e1abbf6a8fd3
2024-06-04 20:35:00 +08:00
Damon Ding
8be865c4be arm64: dts: rockchip: rk3576-iotest: enable edp sound for edp2dp board
Change-Id: I5dfe5e39bbfdd9e617f394d79aac8f392591b750
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2024-06-04 20:34:47 +08:00
Sandy Huang
c235872c42 drm/rockchip: vop2: resolution bigger than 2560 need high performance
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ie7933cb68a32c421c1f35ce4780aa7011d09602b
2024-06-04 20:25:46 +08:00
Sandy Huang
4ca8cfff71 drm/rockchip: vop2: recover vop aclk when enter psr and suspend
Usperspace not commit new frame for long time will triggle
driver enter psr mode, If userspace directly close display
at next time and without any new frame commit, driver will
not exit psr, at this case we need to recover aclk here

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I4bf78c5fa12ca7fa557d8e82d92427b0f849f2eb
2024-06-04 20:25:08 +08:00
Sandy Huang
07bed61e89 drm/rockchip: vop2: udpate linear 10bit yuv format align role
At RK356X/RK3588/RK3562/RK3528 linear 10bit yuv format actual_w should
align as 4 pixel, from RK3576 linear 10bit yuv format actual_w should
align as 2 pixel.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I719f59574442628f2ed2410d6ca20194cf6f580d
2024-06-04 20:24:52 +08:00
Yifeng Zhao
d03a5046f1 arm64: dts: rockchip: rk3588: enable emmc command queue
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I3ca4ccf7920626752115a2a76c0c80c4795412e6
2024-06-04 20:24:22 +08:00
Yifeng Zhao
d5d3f0a6fb arm64: dts: rockchip: rk3576: enable emmc command queue
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ia58b5cefcacac8430bb289315cc0306c6694f1f2
2024-06-04 20:24:08 +08:00
Yifeng Zhao
2ef0767967 mmc: sdhci-of-dwcmshc: add command queue support for rockchip SOCs
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I96c3dfb56d4dd3af3e70cdd59bbd16403abd2fcb
2024-06-04 18:14:53 +08:00
Sergey Khimich
8d00b0267e BACKPORT: mmc: sdhci-of-dwcmshc: Implement SDHCI CQE support
For enabling CQE support just set 'supports-cqe' in your DevTree file
for appropriate mmc node.

Signed-off-by: Sergey Khimich <serghox@gmail.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20240319115932.4108904-3-serghox@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Change-Id: Ie91c0f42f7ac76d92778190c5b0eee770ecb7352
(cherry picked from commit 53ab7f7fe412abd294262e86459f17d965cd65b9)
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
2024-06-04 18:14:53 +08:00
Liming Sun
0f7ce4fc64 BACKPORT: mmc: sdhci-of-dwcmshc: Add error handling in dwcmshc_resume
This commit adds handling in dwcmshc_resume() for different error
cases.

Signed-off-by: Liming Sun <limings@nvidia.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20230822195929.168552-1-limings@nvidia.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit a11937b3cf)
Change-Id: Iade159c45df614cf250234c9297fd309b38b0ea6
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-06-04 18:14:09 +08:00
Sergey Khimich
6a0bf60054 UPSTREAM: mmc: cqhci: Add cqhci set_tran_desc() callback
There are could be specific limitations for some mmc
controllers for setting cqhci transfer descriptors.
So add callback to allow implement driver specific function.

Signed-off-by: Sergey Khimich <serghox@gmail.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20240319115932.4108904-2-serghox@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Change-Id: Iae6c9e69b5a695f8cbdf91aa7586c3e1649bc466
(cherry-picked from 52bf134fca61f0cdb400f4b27766149ca6e1550c)
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
2024-06-04 17:29:09 +08:00
Sugar Zhang
27f113e22c ASoC: rk817: Fix compile warning
Should use '%d' for type 'int'.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I06482bcaf2e88516758450536c616652ce24ea91
2024-06-04 16:42:42 +08:00
Yu Qiaowei
832b62042f video: rockchip: rga3: add 'intl' debug node
Use dma-buf to replace external image buffer

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I000e4cf37b8d338933010dddbbbe36de0ad55b84
2024-06-03 19:40:44 +08:00
Yu Qiaowei
f78e431d62 video: rockchip: rga3: fix 'Use of memory after it is freed' with rga_job
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I9685372fafd84dcb8528f20eeac944ae8c31241c
2024-06-03 19:40:44 +08:00
Yu Qiaowei
7be687eb5d video: rockchip: rga3: use dma to alloc cmd_buffer
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I639facf09766fc632a6690a76fc5b43a466c7bf6
2024-06-03 19:40:44 +08:00
Yu Qiaowei
44e65c2c29 video: rockchip: rga3: add dma_addr in struct rga_dma_buffer
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I5c1208032c957920b51ee6a489a257947b5dc55b
2024-06-03 19:40:44 +08:00
Jianwei Fan
62f5d697fc arm64: dts: rockchip: rk3576-evb1-v10-lontium: add rkvtunnel node
Change-Id: I6182aad1b44d8cfc21dde8c3e168a4febc83e7cf
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2024-06-03 19:37:48 +08:00
Jianwei Fan
9f586c8e42 media: i2c: lt6911c: fix compile errors and sync from from kernel-5.10
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I1cce568db23a791291d06fcad096ece9e75047d4
2024-06-03 19:37:36 +08:00
Yandong Lin
69293bf3d5 video: rockchip: mpp: rk3576: fix dual-core parallel enc issue
Reset the enc core will clear the reference info of the dual-core
parallel encoding, which will cause parallel enc err.
So use another way to workaround.

Change-Id: I3ef8ae3397687929c529b40f21cb34ea3d1c327f
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
2024-06-03 15:55:26 +08:00
Shiqin Chen
1d06937c01 arm64: dts: rockchip: rk3588-toybrick: use rockchip,hdmi as hdmirx audio machine driver
Change-Id: I39d31ff82b6795816f83567a098a79601a39c715
Signed-off-by: Shiqin Chen <chensq@rock-chips.com>
2024-06-03 15:54:12 +08:00
Guochun Huang
a5ee6dd0bd drm/rockchip: dsi2: add slave to component in dual-channel mode
Fixes: d420d65bec ("drm/rockchip: dsi2: optimize drive probe process")

rockchip drm will Registers a new aggregate driver consisting of the
components added to @match by calling one of the component_match_add()
functions. Once all components in @match are available, it will be assembled
by calling &component_master_ops.bind(rockchip_drm_ops.rockchip_drm_bind)
from @ops.

if the dsi->slave is not added into component, the binding status of
the device under the display subsystem becomes abnormal as follows:

cat /sys/kernel/debug/device_component/display-subsystem
aggregate_device name                                  status

-------------------------------------------------------------
display-subsystem                                   not bound

device name                                            status
-------------------------------------------------------------
fdd90000.vop                                        not bound
fde20000.dsi                                        not bound
(unknown)                                      not registered

Change-Id: I5739f06b4ef65f0b8de8f3394f4e811abe31a22c
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2024-06-03 10:19:39 +08:00
Florian Westphal
355dd7a64f UPSTREAM: netfilter: nf_tables: reject QUEUE/DROP verdict parameters
commit f342de4e2f33e0e39165d8639387aa6c19dff660 upstream.

This reverts commit e0abdadcc6.

core.c:nf_hook_slow assumes that the upper 16 bits of NF_DROP
verdicts contain a valid errno, i.e. -EPERM, -EHOSTUNREACH or similar,
or 0.

Due to the reverted commit, its possible to provide a positive
value, e.g. NF_ACCEPT (1), which results in use-after-free.

Its not clear to me why this commit was made.

NF_QUEUE is not used by nftables; "queue" rules in nftables
will result in use of "nft_queue" expression.

If we later need to allow specifiying errno values from userspace
(do not know why), this has to call NF_DROP_GETERR and check that
"err <= 0" holds true.

Bug: 323034288
Fixes: e0abdadcc6 ("netfilter: nf_tables: accept QUEUE/DROP verdict parameters")
Cc: stable@vger.kernel.org
Reported-by: Notselwyn <notselwyn@pwning.tech>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 8e34430e33)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ie6c699cea6f92cd4a7642f196d5f5cbffe268a6d
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-06-03 10:07:23 +08:00
Luo Wei
b27c911206 arm64: dts: rockchip: rk3576-vehicle-evb: modify maxim lock gpio
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I3d372052b742b976fa396f77f927ee3b58e2353b
2024-05-31 19:08:48 +08:00