* commit 'a9ed7b93e657b49420dc7c02c3ce9ce810e9b7d3':
media: rockchip: vicap compatible with rk3588s2
media: rockchip: vicap support combine two mipi to one dev
phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy
Conflicts:
drivers/phy/rockchip/phy-rockchip-csi2-dphy.c
Ignore:
commit 08330d500d ("phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy")
Change-Id: Ief48fe16863dc477a183289f9a4c49881d2d2942
* commit 'c929ccacbb38fb047ca64ffee41ca4ab43f324eb':
include: rk-camera-module: support get/set capture info
include: rkcif-config: support set multi csi info
ARM: dts: rockchip: rv1106 separate the node of csi2 and hw
ARM: dts: rockchip: rv1126 separate the node of csi2 and hw
arm64: dts: rockchip: rk1808 separate the node of csi2 and hw
arm64: dts: rockchip: rk3562 separate hw node of mipi csi2 and mipi dphy
arm64: dts: rockchip: rk3568 separate the node of csi2 and hw
arm64: dts: rockchip: rk3588 separate the node of csi2 logic and hw
arm64: dts: rockchip: rk3588 mipi dphy config modify
Conflicts:
arch/arm64/boot/dts/rockchip/rk3568.dtsi
Ignore:
commit 841fa2175d ("arm64: dts: rockchip: rk3568 separate the node of csi2 and hw")
Change-Id: If60dc34bbe2d753ff36a3325cb5a648b1f80169d
* commit '328145662f6d6154fbf4329a0d53f9c152673648':
mtd: spinand: skyhigh: The vendor requires the devices to be patched
mtd: spinand: foresee: Support new device F35UQA001G-WWT
mtd: spinand: foresee: Support new device F35UQA002G-WWT
mtd: spinand: fmsh: Support new device FM25S01BI3
mtd: spinand: fmsh: Modify incorrect information despite not used
drm/bridge: analogix_dp: add support split area prop
drm/rockchip: dsi2: add support split area prop
drm/rockchip: analogix_dp: support split mode with other display interface
drm/bridge: analogix_dp: support dual connector with other display interface
drm/rockchip: dsi2: support split mode with other display interface
drm/rockchip: drv: Add crtc_clock convert in drm_mode_convert_to_{split,origin}_mode()
drm/bridge: analogix_dp: mv mode_set to bridge .atomic_pre_enable
drm/rockchip: dsi2: mv mode set to encoder .atomic_enable
Change-Id: Ie34682a12a9877c582fc95803edcf527ccdae98e
Conflicts:
drivers/mtd/nand/spi/core.c
Ignore:
commit 328145662f ("mtd: spinand: skyhigh: The vendor requires the devices to be patched")
Change-Id: I5baf8f1296e43b3491994529cb8b4ac1f08b3cf4
1.Double OIP=0 after page 13H
2.The nand flash does not support 84H and 34H command
Change-Id: Ie805f42a36e1a864115988087bdc43592cc94ded
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Commit 000cbb7d4b ("UPSTREAM: usb: gadget: uvc: add scatter gather
support") use scatter gather transfers for uvc isoc. However, the patch
conflicts with rockchip's zero-copy code.
Fixes: 5452a06eed ("usb: gadget: uvc: support zero copy with rockchip encoder")
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: I515d79610a9bba74bbf28b0be974b5081a4b3c76
../drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/aiutils.c:25:10: fatal error: 'typedefs.h' file not found
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I425cb52776bb1b3294b8ef67c951b04afe2288a9
The original WARNING:
memcpy: detected field-spanning write (size 8) of single field "&trace_buffer->name" at drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c:267 (size 1)
WARNING: CPU: 4 PID: 341 at drivers/gpu/arm/bifrost/csf/mali_kbase_csf_trace_buffer.c:267 kbase_csf_firmware_parse_trace_buffer_entry+0x1b8/0x1c0
...
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I27da582ae033b4a89a4a5c7c3e98e636e3336df8
ERROR: modpost: module rga3 uses symbol dma_buf_vmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_vunmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_get from namespace DMA_BUF, but does not import it.
ERROR: modpost: module rga3 uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3fbad697bb9419f91f82d1aa5af087132c07cca7
ERROR: modpost: module iep uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module iep uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2726f9a0d2bc960c4e986aa759a7f7c0d083628d
ERROR: modpost: module rknpu uses symbol dma_buf_mmap from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I956ab29689da5e1089c12757a5ea73ede7c1208e
ERROR: modpost: module video_rkispp uses symbol dma_buf_fd from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_vmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_vunmap from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkispp uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If364340011efaa4e92c9d99a50bb27da24072db5
ERROR: modpost: module video_rkisp uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkisp uses symbol dma_buf_fd from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib2615d64e349ddfcf9f2ffb0bccfa7055c0ae49c
ERROR: modpost: module video_rkcif uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkcif uses symbol dma_buf_fd from namespace DMA_BUF, but does not import it.
ERROR: modpost: module video_rkcif uses symbol dma_buf_export from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1c8940e20546f965edf7438095b20a8365854b09
ERROR: modpost: module cryptodev uses symbol dma_buf_unmap_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_detach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_put from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_get from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_attach from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_map_attachment from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_begin_cpu_access from namespace DMA_BUF, but does not import it.
ERROR: modpost: module cryptodev uses symbol dma_buf_end_cpu_access from namespace DMA_BUF, but does not import it.
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4b456188306f1b69ca0572191a8bb1ff51221732
1. config vp1 pre_dither_down at split mode;
2. disable pre_dither_down at YUV 10/8 bit output and RGB 10 bit output;
3. enable pre_dither_down at RGB 8/6 bit output;
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I304fc66324c97e3e4f50e03b8c8c2c1835871b1a
1. NV12/NV16/YUYV xoffset must aligned as 2 pixel;
2. NV12/NV15 yoffset must aligned as 2 pixel;
3. NV30 xoffset must aligned as 4 pixel;
4. NV15/NV20 xoffset must aligend as 8 pixel at rk3568/rk3588/rk3528/rk3562,
others must aligned as 4 pixel;
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I28d69d1f8189963170ef798c12bfd60fb092ef20
The legacy api drmModeCrtcSetGammalegacy can be called independently, so it need extra config done;
and the atomic api have config done at the vop2_crtc_atomic_flush();
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Idca4c42f1d298ec312dc839ee526e4132d9d8b73
At interlace mode, the adjusted_mode->crtc_vdisplay will be div2 from vdisplay,
but the userspace is still set as adjusted_mode->vdisplay.
Fixes: bfc49df515 ("drm/rockchip: vop3: plane display size check use crtc_* parameter is more correct")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6765e5486dc4d15b0b34b75370280d48500ef4da
Enable the maxim max96772-based panels used on RK3588 vehicle s66 project.
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I2065012318aab045c91500c7f9691bd9bee1007a
logical and physical nodes are separated, one logic node can
connect multi hw node
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibb75cc466452aedff8f50d29331b191d2fbd922a
1. all logic node of mipi phy can get all hw of mipi phy
2. the links between logic and hw is determined by upper level equipmen
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Icc0cb88c3294a119431ac24b0043e44e34b1b292
