Commit Graph

1060341 Commits

Author SHA1 Message Date
Sandy Huang
2bc4f70d30 drm/rockchip: vop2: add CRTC feature interaction with userspace
move alpha scale to crtc feature and add hdr10/dolby hdr info to feature
to interaction with userspace.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I492647a22b41bf43c3127bd56b2ed0b3b95284a2
2021-09-30 10:11:49 +08:00
Sandy Huang
a14c198318 drm/bridge: sii902x: add YUV422 input support
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I0b6cc2a12206eb1cdc9f6c292856196c94b85d90
2021-09-30 10:11:49 +08:00
Sandy Huang
a52fb7412a drm/rockchip: drv: add register rockchip rgb driver
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6dd9d78f6c3899917650a04fc21a10e4a31d9193
2021-09-30 10:11:49 +08:00
Sandy Huang
fb49e5eef8 drm/rockchip: rgb: sync with develop-4.19
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic6945e12dd65e52cd631117721724e4a466f4dd4
2021-09-30 10:11:49 +08:00
Andy Yan
1a24bcdd02 drm/rockchip: vop2: Reset used_layers to 0
used_layers should reset to 0 before count
port_mux.

And also fix the follow warning:
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:2538:26: warning: Value
stored to 'vp' during its initialization is never read
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:2537:21: warning: Value
stored to 'layer' during its initialization is never read

Fixes: e013d2544c ("drm/rockchip: vop2: Assign plane for vp by
plane_mask")

Change-Id: I56b1576070392b7b262ef65b19cf14d1bfde0586
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-09-29 17:59:49 +08:00
Sandy Huang
da9fc4361f drm/rockchip: lvds: add loader protect
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3fbbad4dfc5be934acf997d26e7c83e168b6af67
2021-09-29 15:19:13 +08:00
Wang Panzhenzhuan
be007aa434 media: i2c: nvp6324: update driver to match newest rkcif code
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ieed09f47bddcbd55b8d6bab98a002a1997bf6353
2021-09-29 11:14:18 +08:00
Wangqiang Guo
b7a3954400 input: touchscreen: Add support for gsl3673
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
Change-Id: I950d827f97cbcaa019ce59b028f7effb5008587a
2021-09-28 14:22:43 +08:00
Wyon Bi
536c175f76 arm64: dts: rockchip: Add rk3566-evb2-lp4x-v10-edp.dts
Change-Id: Id56ca263872b42643a66dd063d541968436c4ca6
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-09-28 09:45:53 +08:00
Wyon Bi
0693dbf46c arm64: dts: rockchip: rk3568: Fix graph node unit address error
arch/arm64/boot/dts/rockchip/rk3568.dtsi:1905.18-1920.6: Warning
(graph_port): /hdmi@fe0a0000/ports/port: graph node unit address error,
expected "0"

Fixes: 1c82b603e3 ("arm64: dts: rockchip: rk3568: Add display subsystem dt node")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Id74c8d74f62885b445a91143038dbc1a07ab9881
2021-09-28 09:44:42 +08:00
Wyon Bi
2ab2d84fc0 drm/panel: simple: Add 'panel-timing' support
Fixes: dd03e97b25 ("drm/panel: simple: Get panel-desc data from DT")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: If018e3dc650def01708bcc0e2672af9506c858c5
2021-09-28 09:13:32 +08:00
Cai YiWei
9b386f8693 media: rockchip: isp: fix warn of v4l_enum_fmt
WARNING: CPU: 0 PID: 391 at drivers/media/v4l2-core/v4l2-ioctl.c:1476 v4l_enum_fmt+0x20c8/0x2114

Change-Id: I5343a5c727f3f57aa9f430dedc130cb409b4d022
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-27 18:42:19 +08:00
Sandy Huang
b41d964692 drm/rockchip: vop2: externd rockchip_drm_crtc from drm_crtc
externd rockchip_drm_crtc from drm_crtc, so we can add more private
parameter for dump buffer function.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I9e0450cafe9d184ac4d9daad03749ade1302f249
2021-09-27 18:35:37 +08:00
Sandy Huang
681930bf2d drm/rockchip: vop: externd rockchip_drm_crtc from drm_crtc
externd rockchip_drm_crtc from drm_crtc, so we can add more private
parameter for dump buffer function.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I56ca9c08d7d2bb19de544d56c9bc883d5b880da1
2021-09-27 18:12:42 +08:00
Sandy Huang
c7098c10c2 drm/rockchip: add a debug node to dump buf from userspace
dump path: /data/
debug node: /d/dri/0/ff900000.vop/vop_dump/dump
dump cmd:
    echo dump    > dump to dump one frame
    echo dumpon  > dump to start vop keep dumping
    echo dumpoff > dump to stop keep dumping
    echo dumpn   > dump n is the number of dump times

Change-Id: Id5fefa428db1b5669ceae418cd8bddfa52e52f61
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-09-27 18:11:38 +08:00
Andy Yan
e013d2544c drm/rockchip: vop2: Assign plane for vp by plane_mask
Change-Id: I6cbd87a5c4ecab7a54f30f0a6bfdd8721f86cce9
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-09-27 18:09:28 +08:00
Algea Cao
054249037d drm/bridge: synopsys: dw-hdmi: Fix display err when system boot set hdmi properties
Linux system will set hdmi properties when system boot
When some properties such as quant_range was set, dw_hdmi_setup()
will be called. HDMI status may not be config correctly. So if HDMI
is not properly initialized, don't call dw_hdmi_setup() when
these properties was set.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I6956e50161a4a5bd579f7174c73977d2e33da0c5
2021-09-27 17:29:24 +08:00
Simon Xue
6ff86d87fd iio: adc: rockchip_saradc: fix interrupt issue
Saradc interrupt status may exist forever if read saradc
when system suspending which disable clock that finally
lead to interrupt system dead. Add mutex in suspend to
avoid this issue.

Change-Id: I6a83e4bd79db90a79985685b5e94df2209b5ae81
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-09-27 17:25:06 +08:00
Steven Liu
dcc20720d0 serial: 8250: fix 8250_dwlib.c gki error
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I49c2797bd0c9ac4d7461910555a4a371d407cbd2
2021-09-27 16:53:51 +08:00
Tao Huang
8d1c43f7b4 video: rockchip: mpp: Turn sub device driver Kconfig option into bool
Only one rk_vcodec ko.

Fixes: 5b15717952 ("video: rockchip: mpp: new video codec driver")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I58408cbee1edf11d29b4917aca2eeaef563ed8ce
2021-09-27 14:35:38 +08:00
Tao Huang
a085c0009e arm64: rockchip_gki.config: All mpp sub config as bool
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I45d9d48bcbf7aedf93d51c1edb4ea4eb4bcaca17
2021-09-27 14:33:06 +08:00
Tao Huang
f9686c89d4 arm64: rockchip_gki.config: Enable CONFIG_SW_SYNC as module
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib00f8f20c47f8b6814d5782ea6d68f7e28b22a4d
2021-09-26 15:48:46 +08:00
Sandy Huang
70e8a5ecc4 dma-buf/sw_sync: build sw-sync as module for gki
Fixes: da8f900b52 ("dma-buf/sw_sync: sw_sync register as misc devices")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: If012d5f85b261690cb172b7b61b98212406f6a3d
2021-09-26 15:46:54 +08:00
Wyon Bi
ff9626ac6c mfd: Drop unused rk610/rk616 driver
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I76c73d0c565b04261a099373c7a9200d6058b8ec
2021-09-26 14:26:14 +08:00
Jon Lin
c35d2e69de arm64: dts: rockchip: rk3588s: Add num-cs property to spi
Change-Id: I62470b378ac631c37debac45001c2ae59ec26377
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-26 14:23:20 +08:00
Jon Lin
7703ddf608 arm64: dts: rockchip: rk3568: Add num-cs property to spi
Change-Id: Ie5986d2995d21cb4bcfddd43ca4866de53b75c66
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-26 14:23:20 +08:00
Jon Lin
0b17f9b3f1 spi: rockchip: Fix error in getting num-cs property
Get num-cs u32 from dts of_node property rather than u16.

Change-Id: I265c8c696f1ff884ce6e7690d9c886a2ed1bd267
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-26 14:23:20 +08:00
Cai YiWei
4645dbe6ed media: rockchip: isp: get sensor channel information
Change-Id: I6b5f1a03844b0e2929c29e8253889c8ae69349b3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Cai YiWei
8f300e22f9 media: rockchip: isp: compiled with differe hardware version
Change-Id: Ic18a8ba5005e14f9676716fc9b089ed81bdd38b0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Cai YiWei
3e5d8a772f media: rockchip: isp: enable soft reset for other isp version
Change-Id: I620718f555f091d2ca53214c3fd3cd1a44107692
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Cai YiWei
79b33b499e media: rockchip: isp: fix input crop config for isp21 multi device
Change-Id: I6185273f8474e151ee26c938b8825af383fb73e3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Cai YiWei
c6fc3119d6 media: rockchip: isp: remove associated of cproc and ie
Change-Id: Ic4d6171398322e24993e4a0419fd43fae85672b8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Cai YiWei
bbeb468d79 media: rockchip: isp: add frame loss info to procfs
Change-Id: Idecd94535da352fcde5f2a462d4596316f9ea049
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Cai YiWei
6bb1c3663d media: rockchip: isp: selfpath bytesperline 16 align
Change-Id: I39b36e7e3a8c483f5c77ddbea0f6bebb4e1a0b0a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Cai YiWei
4ab1cc1b50 media: rockchip: isp: off unused interrupt of csi
Change-Id: Iecbd33f2f48dc73fc34af8ee90738db031ee2ffe
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-09-26 10:42:25 +08:00
Jon Lin
ae928f50c7 spi: rockchip: Preset cs-high and clk polarity in setup progress
After power up, the cs and clock is in default status, and the cs-high
and clock polarity dts property configuration will take no effect until
the calling of rockchip_spi_config in the first transmission.
So preset them to make sure a correct voltage before the the first
transmission comming.

Change-Id: Ib00336a3ebda6e04bdb33c56c7da419bfb6efdd9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-09-24 17:28:24 +08:00
Simon Xue
6a355e5f9a iommu/rockchip: fix vop blocked and screen black on RK356X and RK3588
RK3568 and RK3588 has the same issue as RV1126/RV1109 that caused by
dte fetch time limit, So we can set BIT(31) of register 0x24 default
to 1 as a workaround.

Change-Id: Ib0d1fd110aa0349145a63f7c4be5ce77ed6ab4e4
Fixes: 7f8158fb41 ("iommu: rockchip: disable fetch dte time limit")
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-09-24 17:27:27 +08:00
Wyon Bi
bd4cd9a4c9 arm64: dts: rockchip: rk3588: Add hdptxphy1 node
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ie8f483dd86e7279beed2b7e9aa7c00ec2be930e6
2021-09-24 17:27:27 +08:00
Yu Qiaowei
b41b6ffed6 video/rockchip: rga2: Modify the memory check of dma buffer.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I9f51a0ec08c49a86b70c775cc9e81f3d70384553
2021-09-24 17:27:27 +08:00
Andy Yan
585789020e drm/rockchip: vop2: configure half_block_en bit in all mode
First we thought the half_block_en bit in AFBCD_CTRL register
only work in afbc mode. But the fact is it control the line buffer
in all mode(afbc/tile/line), so we need configure it in the
all case.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ib8cd5fbfd0a898eea738423685fbcdc0ab6d00ad
2021-09-24 17:27:27 +08:00
Andy Yan
240d8a3bd7 drm/rockchip: set output_if for rgb connector
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I6c832a1e7fd8cca69da5f6cfdd9681d72696d67a
2021-09-24 17:27:27 +08:00
Andy Yan
dc3a451bf1 drm/rockchip: set output_type as DRM_MODE_CONNECTOR_DPI for RGB interface
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I81cce6e4f3323ae2b6ba2b20916a0875c36d41fb
2021-09-24 17:27:27 +08:00
Andy Yan
1ec9f0640d drm/rockchip: Specific port_id when use of_graph_get_port_by_id in rgb
This is prepare for vop2 which has multi ports.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ibca577d7738705fa425a07fbc5ea5d867b7693d7
2021-09-24 17:27:27 +08:00
Andy Yan
74fb3941eb drm/rockchip: make VOP_FEATURE_ definitions public for all vop versions
Definition VOP_FEATURE_OUTPUT_RGB10 and VOP_FEATURE_INTERNAL_RGB
are from upstream, so we move our private definition VOP_FEATURE_AFBDC
and VOP_FEATURE_ALPHA_SCALE to other bits.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I44a4f4864bd7d82af120dfe361b9af700d7d8ae9
2021-09-24 17:27:27 +08:00
Yu Qiaowei
1b8283e911 video/rockchip: rga2: Added support for ARGB format
Add ARGB8888/XRGB8888/ARGB5551/ARGB4444/ABGR8888/XBGR8888/ABGR5551/ABGR4444.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I9eb8f5fbcc1a87a5750b7dc2eaf808f8395856a0
2021-09-24 17:27:27 +08:00
Yu Qiaowei
50ec41b5c2 video/rockchip: rga2: Optimize the process of mapping dma.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ie8d140d8fc102c9a3677b266ac7848c4c3ade78e
2021-09-24 17:27:27 +08:00
Sandy Huang
c15fbd9827 drm/rockchip: vop: add support yuv10bit format
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I720fd9809ed2b628afae086aa64958fdbe4ee2de
2021-09-24 17:27:27 +08:00
Sandy Huang
f4725608d9 drm/rockchip: vop: add support afbc format
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Idff1ac169854d7338eb63ae49a8ed0496659298e
2021-09-24 17:27:27 +08:00
Sandy Huang
3c95a80fe2 drm/rockchip: drv: delete some unused property
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6802fe7b92ac8993cb48135fa3a77547ee44b43a
2021-09-24 17:27:27 +08:00
Sandy Huang
110feb525a drm/rockchip: vop: add and remove some property
add and remove some property to compatibility with hwc 2.0

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I8239ce40e30da6e2be55e0ccfa6748816c0fcf2a
2021-09-24 17:27:27 +08:00