Commit Graph

1292717 Commits

Author SHA1 Message Date
Tao Huang
0118db0cbc Merge commit '83950944033f768197600e90b37468f7e38cd388'
* commit '83950944033f768197600e90b37468f7e38cd388':
  drm/bridge: synopsys: dw-hdmi: Fix hdmi color can't be switched when entering kernel
  drm/bridge: synopsys: dw-hdmi-qp: Independently configure color and infoframe
  video: rockchip: mpp: Fix load info not clear issue
  video: rockchip: mpp: rkvenc2: Fix the timeout threshold config issue
  arm64: dts: rockchip: Fixes mmc_ecsd address for rv1126b-fastboot-emmc
  ARM: dts: rockchip: Fixes mmc_ecsd address for rv1126b-thunder-boot-emmc
  soc: rockchip: thunderboot_mmc: disable DMA upon transfer completion
  PCI/ASPM: Disable ASPM L0s/L1 on CYW989459 Wireless Module
  Revert "PCI: disable L0s for CYW989459 Wireless Module"
  dt-bindings: suspend: rv1126b: add RKPM_SLP_32K_IO macro
  media: rockchip: vpss: add FBC format alignment check for width/height
  arm64: config: rv1126b: Enable CONFIG_VIDEO_ROCKCHIP_AIISP
  video: rockchip: rga3: mpi_commit: support modify width/height in rotate 90/270
  arm64: config: rv1126b: Enable CONFIG_SQUASHFS

Change-Id: Iaf9edda12817100194461e054339cd486758a6fb
2025-08-25 19:08:37 +08:00
Algea Cao
8395094403 drm/bridge: synopsys: dw-hdmi: Fix hdmi color can't be switched when entering kernel
In scenarios where U-boot can read EDID but the kernel cannot,
HDMI color of U-boot and the kernel may differ. The current color
switching process causes this scenario where HDMI enters the
kernel but fails to switch to the correct color. Optimize process
of switching colors to solve this problem.

Change-Id: I36c7d7e68e438bd33f9d2804d4a5a34edda9ba4a
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2025-08-25 10:52:16 +00:00
Algea Cao
949befa2e7 drm/bridge: synopsys: dw-hdmi-qp: Independently configure color and infoframe
When the HDMI status changes, there is no need to call
dw_hdmi_qp_setup() function every time. The configuration can be
carried out independently for specific changed parts. This can
reduce delays and avoid mutual interference.

Change-Id: I5999961893d517cba04c58ca0c96fe201d413ee0
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2025-08-25 10:52:16 +00:00
Yandong Lin
c79104d972 video: rockchip: mpp: Fix load info not clear issue
The default is to clear mpp load info during suspend, but suspend config may be turned off, resulting in load info not being cleared.

Change-Id: Ic930d3f691dc2f1694acfdc7ac1cbe4f022b4e62
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
2025-08-25 10:45:27 +00:00
Yandong Lin
6b47e41786 video: rockchip: mpp: rkvenc2: Fix the timeout threshold config issue
Change-Id: If08868806b167fa7d6b2dfd75b6ad0f44fde70a7
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
2025-08-25 10:45:17 +00:00
Ziyuan Xu
ea06a72307 arm64: dts: rockchip: Fixes mmc_ecsd address for rv1126b-fastboot-emmc
Fixes: dbdfcd9a91 ("arm64: dts: rockchip: Add rv1126b fastboot for emmc/spi nand/spi nor")
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I2797f7c9552c5ce4306858f59078f544fffa037b
2025-08-25 03:36:02 +00:00
Ziyuan Xu
5a0dd5d2ca ARM: dts: rockchip: Fixes mmc_ecsd address for rv1126b-thunder-boot-emmc
Fixes: 327f216065 ("ARM: dts: rockchip: Add rv1126b-evb2-v10-tb-400w-spi-nor support")
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Id10e07c350f146e5c75f4657e3fa2b491e8c417c
2025-08-25 03:36:02 +00:00
Yifeng Zhao
9d7731c347 soc: rockchip: thunderboot_mmc: disable DMA upon transfer completion
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I8f61eae3acdef85157452a29124e95e7fc4cf1fb
2025-08-25 03:31:04 +00:00
Xu Xuehui
52a34e877e PCI/ASPM: Disable ASPM L0s/L1 on CYW989459 Wireless Module
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
Change-Id: Ib4b93edaa9161e4ebd46243561014bdbb87c43ca
2025-08-25 11:10:39 +08:00
Xu Xuehui
1ef5a401b9 Revert "PCI: disable L0s for CYW989459 Wireless Module"
This reverts commit fa17e4b1d3.

Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
Change-Id: I5b7ee55610cfc0861e637f6234229f95b23bc44a
2025-08-25 11:10:31 +08:00
XiaoDong Huang
702cba79f0 dt-bindings: suspend: rv1126b: add RKPM_SLP_32K_IO macro
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I1c6b01d8023db0c82aaac0fcf6c23b054b676d4a
2025-08-22 16:39:58 +08:00
Wei Dun
308d917697 media: rockchip: vpss: add FBC format alignment check for width/height
Change-Id: Ia35e17fd0c825b694f609c2a8f3636d261465c7c
Signed-off-by: Wei Dun <willam.wei@rock-chips.com>
2025-08-22 06:06:43 +00:00
Weiwen Chen
8fa42a17cf arm64: config: rv1126b: Enable CONFIG_VIDEO_ROCKCHIP_AIISP
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I1c0cfae2b3044f733163fe0a538559a5857d2fd6
2025-08-22 11:24:53 +08:00
Yu Qiaowei
c820efabce video: rockchip: rga3: mpi_commit: support modify width/height in rotate 90/270
Change-Id: I20372e8b4b12ebc10ad3b9d89d9ef67c04edbdd5
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-08-22 03:10:34 +00:00
Weiwen Chen
3b55829f9f arm64: config: rv1126b: Enable CONFIG_SQUASHFS
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I9571f0acb3ef6dcfc7740c22f6a7fa15e0ed6eba
2025-08-21 19:32:00 +08:00
Tao Huang
064a633aca Merge commit 'a958fa1893e366cd93186175c9d518bd005e2b89'
* commit 'a958fa1893e366cd93186175c9d518bd005e2b89': (21 commits)
  drm/bridge: synopsys: dw-hdmi-qp: Make sure video data path is enable when start transmit video
  drm/rockchip: Fix error in rgb2rgb matrix calculation
  media: i2c: ov13b10: fix read otp error
  arm64: config: rv1126b: Enable CONFIG_ELF_CORE
  drm/bridge: analogix_dp: Reuse &link_train.training_lane[] to set DPCD DP_TRAINING_LANEx_SET
  media: rockchp: vpss: fix unite mode scaling and improve trigger logic
  arm64: dts: rockchip: rv1126b-evb2-v10: disabled gmac and dsi
  arm64: dts: rockchip: rv1126b/bp: update opp-table for cpu/npu/dmc/enc
  clk: rockchip: clk-pvtpll: update cpu/npu/enc pvtpll config for rv1126b
  clk: rockchip: rv1126b: add more frequency point for cpu
  media: rockchip: vicap: fixes sof not sync to frame when use thunderboot skip
  media: rockchip: vicap: fixes error deal of scale handle for rv1103b
  media: rockchip: vicap add soft reset before restart stream
  media: rockchip: vicap fixes stream loss when use switch with online mode
  media: rockchip: vicap fixes buf lack source to avoid stream loss
  media: rockchip: vicap fixes stream loss after sensor flip
  media: rockchip: vicap fixes error of switch logic when one of sensor is stream off
  media: rockchip: vicap reinit switch state when resume or retry one_frame
  media: rockchip: add procfs for avsp
  ARM: dts: rockchip: Add rv1126bp-evb1-v12.dts
  ...

Change-Id: Ia1a2dae6cab4f9af65228afe107e552a98245660
2025-08-21 19:17:22 +08:00
Algea Cao
a958fa1893 drm/bridge: synopsys: dw-hdmi-qp: Make sure video data path is enable when start transmit video
When conducting FRL training, the video data transmitted from
VOP to HDMI must be disabled. Until the training is successful
or fails, then it will be reopened. When the FRL training fails,
the video transmission from the video to HDMI is not re-enabled.
This will result in the inability to display normally even when
switching to tmds mode after training fails.
Therefore, regardless of the specific scenario, when switching
to the tmds mode, the data transmission from VOP to HDMI must be
enabled.

Change-Id: I1c853c8197fdf7aaef32c80c5cdb73db13d9ec4c
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2025-08-21 11:16:10 +00:00
Algea Cao
0b7cf07695 drm/rockchip: Fix error in rgb2rgb matrix calculation
The variable 'T' in the calculation formula
'output = T * M1 * N_y2r * M0 * N_r2y' has been omitted.

Change-Id: I347eca9786729de0ce35c35f483b55a7cb62bd7e
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2025-08-21 11:15:56 +00:00
Jianwei Fan
979dc17bdd media: i2c: ov13b10: fix read otp error
Change-Id: I6ef10ccf49535fd5975fbf577d76ab88e6c21a60
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2025-08-21 11:15:33 +00:00
Weiwen Chen
cf53e1cb9e arm64: config: rv1126b: Enable CONFIG_ELF_CORE
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I9fe918caa258ab3852bb3ecd9836f1974dafa657
2025-08-21 08:36:34 +00:00
Damon Ding
8399e8fa0f drm/bridge: analogix_dp: Reuse &link_train.training_lane[] to set DPCD DP_TRAINING_LANEx_SET
In analogix_dp_link_start(), &link_train.training_lane[] is used to
set phy PE/VS configurations, and buf[] is initialized with the same
values to set DPCD DP_TRAINING_LANEx_SET.

It makes sense to reuse &link_train.training_lane[] to set DPCD
DP_TRAINING_LANEx_SET, which can remove the redundant assignments
and make codes more consice.

Change-Id: I38869c22f8cc93b18b3b27bc41a0975700b328d1
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2025-08-21 06:16:18 +00:00
Wei Dun
ce8decd06f media: rockchp: vpss: fix unite mode scaling and improve trigger logic
Change-Id: I4b725c09c3ddaeaba68399cbf90c38eba3c9e235
Signed-off-by: Wei Dun <willam.wei@rock-chips.com>
2025-08-21 06:12:50 +00:00
Jkand Huang
2b7d96d610 arm64: dts: rockchip: rv1126b-evb2-v10: disabled gmac and dsi
Change-Id: I21d093361e534bc7e14d35dccfd170e81405a12d
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
2025-08-21 06:05:54 +00:00
Liang Chen
9c41e4bc2d arm64: dts: rockchip: rv1126b/bp: update opp-table for cpu/npu/dmc/enc
Change-Id: If9fd7ed8e043de38bdf82da4afc468f5c150d1d7
Signed-off-by: Liang Chen <cl@rock-chips.com>
2025-08-21 03:38:58 +00:00
Liang Chen
0c4216be46 clk: rockchip: clk-pvtpll: update cpu/npu/enc pvtpll config for rv1126b
Change-Id: I5c314e4e868add14a118b3781578e8860c409218
Signed-off-by: Liang Chen <cl@rock-chips.com>
2025-08-21 03:38:49 +00:00
Liang Chen
b21d340b96 clk: rockchip: rv1126b: add more frequency point for cpu
Change-Id: Id444d439b0e2807626b53073e1794db6696f42fb
Signed-off-by: Liang Chen <cl@rock-chips.com>
2025-08-21 03:38:40 +00:00
Zefa Chen
cea5c0c900 media: rockchip: vicap: fixes sof not sync to frame when use thunderboot skip
Change-Id: I572a9b671d2036eec2fec413ea83eca5ef0082fb
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 03:38:16 +00:00
Zefa Chen
c6d7e76576 media: rockchip: vicap: fixes error deal of scale handle for rv1103b
Change-Id: Ie11c60b8dbbc0e2f3fe753f35485ae8f9a655824
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 03:38:03 +00:00
Zefa Chen
151a238fb1 media: rockchip: vicap add soft reset before restart stream
Change-Id: I1e3c6564f076fa15b18f8f2a384d86dc20ef093e
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 11:36:36 +08:00
Zefa Chen
3f4adbc02c media: rockchip: vicap fixes stream loss when use switch with online mode
Change-Id: I4abab7f8d7ae9c446615feb2dd5bbe262b8d442e
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 11:36:36 +08:00
Zefa Chen
b836102842 media: rockchip: vicap fixes buf lack source to avoid stream loss
Change-Id: I6a213bbbd8f445c4544120af5ccd004e58624151
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 11:36:36 +08:00
Zefa Chen
b5dec879f8 media: rockchip: vicap fixes stream loss after sensor flip
Change-Id: Ia21357c85cc3a72e49233d877d4ee33a600c5399
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 11:36:36 +08:00
Zefa Chen
314fcb5f92 media: rockchip: vicap fixes error of switch logic when one of sensor is stream off
Change-Id: I698568cf4bb1dc9c84a27a88a2d5420b7abf773b
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 11:36:36 +08:00
Zefa Chen
fdc5d20c46 media: rockchip: vicap reinit switch state when resume or retry one_frame
Change-Id: I748bd1edcb353317f3604f1451f7ccaa011ba9dc
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-21 03:35:26 +00:00
Zhizhen Zheng
141729498a media: rockchip: add procfs for avsp
Change-Id: I2bb91327df23dd62a0007ab9db2a35756d4917dc
Signed-off-by: Zhizhen Zheng <zhizhen.zheng@rock-chips.com>
2025-08-21 03:13:37 +00:00
Weiwen Chen
9823ea522b ARM: dts: rockchip: Add rv1126bp-evb1-v12.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Id48aece2b4517f15941596c94263e9786a6639a4
2025-08-20 12:12:25 +00:00
Weiwen Chen
0fb74a4bb5 arm64: dts: rockchip: Add rv1126bp-evb1-v12.dts
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I3ea05523924f01c218b5556834d11c1e4e905408
2025-08-20 12:12:17 +00:00
Tao Huang
5aab613c64 Merge commit '64af21a26c9bcb3fcf6e771ea8465454706bd499'
* commit '64af21a26c9bcb3fcf6e771ea8465454706bd499':
  ARM: dts: rockchip: add rv1126b-evb1-v11-5x-cam.dts
  arm64: dts: rockchip: add rv1126b-evb1-v11-5x-cam.dts
  Mali: valhall: Remove dependencies on KBASE_PM_RUNTIME
  arm64: dts: rockchip: add rv1126b-evb-5x-cam.dtsi
  soc: rockchip: rockit: modify isp supporting device to 5
  video: rockchip: rga3: remove set job->ret in rga_job_commit.
  video: rockchip: rga3: use dma_map_sg instead of dma_map_resouce
  video: rockchip: rga3: use genpool/dmapool to manage cmd_buf on each scheduler
  video: rockchip: rga3: fix dma_alloc_coherent not using main device
  media: i2c: sc831ai: fix the probability of horizontal stripes caused by unstable DVDD
  media: i2c: sc831ai fix compile error
  media: rockchip: vicap limit virtual width at least 8 aligned
  media: rockchip: vicap support ext_master/ext_slave sync mode
  media: rockchip: vicap add reg of read size for rv1126b
  arm64: dts: rockchip: rv1126b.dtsi add rkisp-vir4
  media: i2c: sc635hai fixes fps reduce by half with slave mode
  misc: rockchip: pcie-rkep: Support PCIE_EP_RESET_CTRL

Change-Id: Iec55460d6797418c3e37284683b7a10470aa20ba
2025-08-20 18:56:37 +08:00
LongChang Ma
64af21a26c ARM: dts: rockchip: add rv1126b-evb1-v11-5x-cam.dts
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: I400dc5f73e94c387da9cf35c7d4341585756567f
2025-08-20 14:30:12 +08:00
LongChang Ma
f4e8afb9a6 arm64: dts: rockchip: add rv1126b-evb1-v11-5x-cam.dts
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: Ied2726200e79a811cab85973aa33695aab4402c8
2025-08-20 14:27:42 +08:00
Zhen Chen
63bd7f3d52 Mali: valhall: Remove dependencies on KBASE_PM_RUNTIME
KBASE_PM_RUNTIME was originally defined by ARM.
However, in the modification to upgrade driver to g29p0-00eac0 (r54), ARM removed KBASE_PM_RUNTIME,
and the source code that depended on KBASE_PM_RUNTIME was modified to be enabled by default.
This modification corresponds to
commit fb91362a23 ("MALI: valhall: upgrade DDK to g29p0-00eac0, from g28p0-00eac0").

Some code previously added by finley.xiao@rock-chips.com also depends on KBASE_PM_RUNTIME.
After picking the above commit, the definition of KBASE_PM_RUNTIME was removed,
making the code added by Finley unable to be enabled.
This may lead to anomalies such as "failed to get ack on domain 'gpu'...",
as referenced in https://redmine.rock-chips.com/issues/568204.

This modification fixes the issue above.

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: Ibf57f363f4f779eceb0e7891271e41cae1a560ea
2025-08-20 06:18:08 +00:00
LongChang Ma
54f981afcb arm64: dts: rockchip: add rv1126b-evb-5x-cam.dtsi
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: If04bc01d4fc20e854caaa1a9fac9ce606077d358
2025-08-20 03:11:41 +00:00
LongChang Ma
40669e1d8e soc: rockchip: rockit: modify isp supporting device to 5
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Change-Id: Iebfd3af4376ce6fbdab9fdda590239b9acb174ad
2025-08-20 03:10:59 +00:00
Yu Qiaowei
dd93143725 video: rockchip: rga3: remove set job->ret in rga_job_commit.
Change-Id: I7a42d3b623012c0904b0eadec509a3f82c8e587c
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-08-20 01:52:39 +00:00
Yu Qiaowei
6e89da27be video: rockchip: rga3: use dma_map_sg instead of dma_map_resouce
Change-Id: Ic41f6eb94d2dd749f71bfa02ba718e6bb4dcd263
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-08-20 01:52:39 +00:00
Yu Qiaowei
ae35fd7eec video: rockchip: rga3: use genpool/dmapool to manage cmd_buf on each scheduler
In some scenarios with high timing requirements, frequent calls to
dma_alloc_coherent may trigger memory reclamation with low probability,
thereby increasing the overall time consumption per frame.

Change-Id: I28ffe47c5db40c82a54254b056f117931efbe38e
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-08-20 01:52:39 +00:00
Yu Qiaowei
ea07a6e6fe video: rockchip: rga3: fix dma_alloc_coherent not using main device
The iommu device needs to be mapped using a unified main device.

Change-Id: I5b5820b590101dde1713889c056edc034d7322ea
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2025-08-20 01:52:39 +00:00
Zefa Chen
849ea47868 media: i2c: sc831ai: fix the probability of horizontal stripes caused by unstable DVDD
Change-Id: I6097bd8ce66149a3849961e0a88d48c1b7de4ce5
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-20 01:50:20 +00:00
Zefa Chen
b2d836232b media: i2c: sc831ai fix compile error
Change-Id: I7c7cccdd947c42f57180279011d18edaf4702912
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-20 09:24:32 +08:00
Zefa Chen
996336689c media: rockchip: vicap limit virtual width at least 8 aligned
Change-Id: I108f4cb48ebd4a2ced7e39f71aa71044367e387e
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2025-08-19 10:16:12 +00:00