Commit Graph

1058904 Commits

Author SHA1 Message Date
Sandy Huang
241f13f049 drm/rockchip: vop2: alpha value need transfer to next mix
Change-Id: I2f00b8f834cd93a206643c0faaf557d38c238a13
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-07-09 11:42:42 +08:00
Sandy Huang
aed22eb670 drm/rockchip: vop2: fix start mixer id error
Change-Id: I6e6287d43d375f8a8be47fe00cbe39764ffe6ee3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-07-09 11:42:42 +08:00
Zhixiong Lin
f5fe9966d4 GPU: Kconfig: add gpu Kconfig to video Kconfig
Change-Id: I9938fe0377fc57e030c9e5109c216d6c62dbeef0
Signed-off-by: Zhixiong Lin <zhixiong.lin@rock-chips.com>
2021-07-09 09:26:18 +08:00
Zhen Chen
f5f907a67f MALI: mali400: Fix all compile errors under kernel 5.10
Change-Id: Iee1e5bc609e703de0c1e7c1f781ba7059c4aa6ae
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-07-09 09:26:18 +08:00
Zhen Chen
970017f88e MALI: midgard: Fix all compile errors under kernel 5.10
Change-Id: I8672520b7c7118ab7622032481802eae72349f81
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2021-07-09 09:26:17 +08:00
Tao Huang
fcb101fe62 arm64: rockchip_linux_defconfig: Enable CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
GPU drivers should select this config.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I967547f19473f7617c127ef94310655f66a92510
2021-07-09 09:26:17 +08:00
Tao Huang
07bf6d1a58 ARM: rockchip_linux_defconfig: Enable CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
GPU drivers should select this config.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5acced3f823c5865aa0cd316f0d60ed8a0a028a5
2021-07-09 09:26:17 +08:00
Guochun Huang
fe9341a608 drm/rockchip: dsi: add dphy timing for possible external dphy
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I94e16fe908558edeb0919b64621f7a8c1c58c6a4
2021-07-08 20:32:53 +08:00
Guochun Huang
c39319e998 drm/rockchip: dsi: support lane_rate can be specified manually
Change-Id: Ib0db1a80737410c65440f4ac3b888f43a44bdd9c
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2021-07-08 20:31:59 +08:00
Sandy Huang
c945c0476d drm/rockchip: don't mask possible_crtcs if remote-point is disabled
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Id8bb14fdb025f43da5d10626b660c2fcad490e39
2021-07-08 20:30:35 +08:00
Sandy Huang
b8798bd004 drm/rocckhip: implement rockchip_drm_gem_prime_import
when import dma-buf we should compare dma_buf->ops with rockchip_drm_gem_prime_dmabuf_ops;
so we implement rockchip_drm_gem_prime_import to instead of drm_gem_prime_import.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iab3260b5c3efb5634d411eb1e8620fb575aa063c
2021-07-08 20:28:53 +08:00
Mark Yao
55e4328316 drm/rockchip: gem: Add begin/end cpu access
Change-Id: Ie2c54addcf037cf501edcad76470e5e46c667b7e
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-07-08 20:28:53 +08:00
Guochun Huang
5b846d1e70 arm64: dts: rockchip: rk3568: video_phy: appending compatible property
make old u-boot happy.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Iefa4915abf5d3ada9865bc710e9aba0f1c47ddea
2021-07-08 20:26:43 +08:00
Huang Jiachai
da8f900b52 dma-buf/sw_sync: sw_sync register as misc devices
Because the kernel debug fs will removed from android 11, so we move
sw_sync to misc devices, as android lib sync has done the compatibility
work, so after this commit, the hwc there is no need to update.

Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Change-Id: I799b66b1ba98c9370893b9554095664010b635df
2021-07-07 20:53:14 +08:00
Andy Yan
c631006b69 drm/rockchip: register vop2 platform driver
Change-Id: Id34b88f47b785bf8372d1710a280d294347d6693
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-07-07 20:43:14 +08:00
Zhen Chen
ebf7d491c2 arm64: rockchip_defconfig: Enable DMABUF heaps
+CONFIG_DMABUF_HEAPS=y
+CONFIG_DMABUF_SYSFS_STATS=y
+CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y
+CONFIG_DMABUF_HEAPS_PAGE_POOL=y
+CONFIG_DMABUF_HEAPS_SYSTEM=y
+CONFIG_DMABUF_HEAPS_CMA=y

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I16a9a609c94145567eec2043b5d71a2df7e54937
2021-07-07 20:33:59 +08:00
Caesar Wang
18e3fba39e MALI: bifrost: fixes the bifrost built
dmesg log from bootup:
...
[    0.988106] mali fde60000.gpu: GPU identified as 0x2 arch 7.4.0 r1p0 status 0
[    0.988199] mali fde60000.gpu: No memory group manager is configured
[    0.989228] mali fde60000.gpu: Probed as mali0

[root@RK356X:/]# cat ./sys/devices/platform/fde60000.gpu/gpuinfo
Mali-G52 1 cores r1p0 0x7402

[root@RK356X:/]# ls /sys/class/devfreq/fde60000.gpu/
available_frequencies  governor  name              target_freq
available_governors    load      polling_interval  timer
cur_freq               max_freq  power             trans_stat
device                 min_freq  subsystem         uevent

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I1669385cd2609fbe8ba4507f777e904e1f6c6961
2021-07-07 14:23:02 +08:00
Liang Chen
96082a70ef arm64: dts: rockchip: rk356x: enable bus_npu for some boards
Enable bus_npu so that we can enable npu@1.0G safely when necessary.

Change-Id: I1a6ce1652aba7bafe91135bc79881cad0d5980ce
Signed-off-by: Liang Chen <cl@rock-chips.com>
2021-07-06 19:35:04 +08:00
Huang zhibao
42aa5d5af3 arm64: dts: rockchip: nvr: incluede rk3568-nvr-linux instead of rk3568-linux
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I954c67c806714e72043e9613e7fa13d1e04069cf
2021-07-06 19:35:04 +08:00
Huang zhibao
d7eab696af arm64: dts: rockchip: rk3568-nvr: io-domian all default set 3.3V for rk356x boards
io-domian  default as:
&pmu_io_domains {
    status = "okay";
    pmuio2-supply = <&vcc_3v3>;
    vccio1-supply = <&vcc_3v3>;
    vccio3-supply = <&vcc_3v3>;
    vccio4-supply = <&vcc_3v3>;
    vccio5-supply = <&vcc_3v3>;
    vccio6-supply = <&vcc_3v3>;
    vccio7-supply = <&vcc_3v3>;
};
TODO:
Need to be modified according to the actual hardware
for example rk3568-nvr-demo v10/V12 board:
&pmu_io_domains {
    status = "okay";
    pmuio2-supply = <&vcc_3v3>;
    vccio1-supply = <&vcc_3v3>;
    vccio3-supply = <&vcc_3v3>;
    vccio4-supply = <&vcc_1v8>;
    vccio5-supply = <&vcc_3v3>;
    vccio6-supply = <&vcc_1v8>;
    vccio7-supply = <&vcc_3v3>;
};

Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I707ee8fbce7564db908ca0682c3ead5bf621f95e
2021-07-06 19:35:04 +08:00
Huang zhibao
3d4ce4e2a1 arm64: dts: rockchip: rk3566-box: io-domian all default set 3.3V for rk356x boards
io-domian  default as:
&pmu_io_domains {
    status = "okay";
    pmuio2-supply = <&vcc_3v3>;
    vccio1-supply = <&vcc_3v3>;
    vccio3-supply = <&vcc_3v3>;
    vccio4-supply = <&vcc_3v3>;
    vccio5-supply = <&vcc_3v3>;
    vccio6-supply = <&vcc_3v3>;
    vccio7-supply = <&vcc_3v3>;
};
TODO:
Need to be modified according to the actual hardware
for example rk3566-box-demo v10 board:
&pmu_io_domains {
    status = "okay";
    pmuio2-supply = <&vcc_3v3>;
    vccio1-supply = <&vcc_3v3>;
    vccio3-supply = <&vcc_3v3>;
    vccio4-supply = <&vcc_1v8>;
    vccio5-supply = <&vcc_3v3>;
    vccio6-supply = <&vcc_1v8>;
    vccio7-supply = <&vcc_3v3>;
};

Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ifda027a8ceb0bd9cb7ae34a6f0599100abc431b4
2021-07-06 19:35:04 +08:00
David Wu
6e097f589e arm64: dts: rockchip: Add QSGMII support for rk3568-evb2
Maybe some people want to use the Ethernet function of evb2,
which is turned on by default so that the Ethernet can work.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I314ac4e0d51804ea3463735d6cc9c90a536d173a
2021-07-06 19:35:04 +08:00
Huang zhibao
d57c7e89db arm64: dts: rockchip: rk3566-box: fix vdd_logic max-microvolt
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I19469288b52b58824fd8a7f9d70a1991c5835fba
2021-07-06 19:35:04 +08:00
Wu Liangqing
c3942188fe arm64: dts: rockchip: io-domian all default set 3.3V for rk356x boards
io-domian  default as:
&pmu_io_domains {
     status = "okay";
     pmuio2-supply = <&vcc3v3_pmu>;
     vccio1-supply = <&vccio_acodec>;
     vccio3-supply = <&vccio_sd>;
     vccio4-supply = <&vcc_3v3>;
     vccio5-supply = <&vcc_3v3>;
     vccio6-supply = <&vcc_3v3>;
     vccio7-supply = <&vcc_3v3>;
};
TODO:
Need to be modified according to the actual hardware
for example rk3568-evb:
&pmu_io_domains {
     status = "okay";
     pmuio2-supply = <&vcc3v3_pmu>;
     vccio1-supply = <&vccio_acodec>;
     vccio3-supply = <&vccio_sd>;
     vccio4-supply = <&vcc_1v8>;
     vccio5-supply = <&vcc_3v3>;
     vccio6-supply = <&vcc_1v8>;
     vccio7-supply = <&vcc_3v3>;
};

Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I296a696851c2a85618d08cce82da546c72266699
2021-07-06 19:35:04 +08:00
Huang zhibao
b3a9925bb7 arm64: dts: rockchip: rk3566-box: update io_domain
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I70335dd9075bafd852e78f4a99a8942f0afd0856
2021-07-06 19:35:04 +08:00
Huang zhibao
f9712b92da arm64: dts: rockchip: rk3566-box: disable ddr auto-freq-en
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I9fdd665184c4ee60cd4dc4c7e5857f496f1970f2
2021-07-06 19:35:04 +08:00
Caesar Wang
f3d3879b27 arm64: dts: rockchip: disable afbc by default on rk3568-linux.dtsi
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I1dbf50e9056242991afae4df3303c739065dfb6b
2021-07-06 19:35:04 +08:00
Zorro Liu
320b7b3949 arm64: dts: rockchip: rk3566-eink: add more ddr freq and disabled default
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: If8e2d053c9d07fb539e53c72f5705cdfe74cf600
2021-07-06 19:34:51 +08:00
Ding Wei
057aa9667b arm64: dts: rockchip: rk3568-nvr: Set parameters for nvr
1. rockchip,disable-auto-freq, means when get/set/reduce freq,
   return directly.
2. set assigned-clock-rates at hardware running rates, then
   it not need to adjust before running.

Change-Id: I0d7864112bb5ade99e29bcce9824f84e9a58735e
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-07-06 19:23:38 +08:00
Weixin Zhou
46955357d0 arm64: dts: rockchip: rk3566-eink: setting sleep_sta_ctl on in ultra sleep only
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I40484a87ef97429649620adebdc466cfadad4dc3
2021-07-06 19:23:38 +08:00
Tao Huang
0de7b74540 arm64: dts: rockchip: Disable CPU_SLEEP idle state on rk3568-nvr
Reduce wake up latency.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I704c359338e2ef556f56af63875be54335974b52
2021-07-06 19:23:38 +08:00
Tao Huang
400987e347 arm64: dts: rockchip: rkvdec use 64KB sram on rk3568-nvr
Without DDR freq, rkvdec can use all sram.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I17ddd8715ffff524613ba0a2f906d51ec12f4a94
2021-07-06 19:23:38 +08:00
Tao Huang
8d3b03c894 Revert "arm64: dts: rockchip: rk3568-nvr: remove rcb reference properties"
This reverts commit fc2f74ccdd.

Use sram can reduce the memory bandwidth usage.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5fae577671a905348239d0a40299d69e4cd8e6bb
2021-07-06 19:23:38 +08:00
Alex Zhao
e5b8734cd5 arm64: dts: rockchip: rk356x board: give wifi some time after power-on.
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I29503ce3f328862361fda1c192aaff5d3b3781cb
2021-07-06 19:23:38 +08:00
Xiao Ya peng
898c29ea76 arm64: dts: rockchip: rk3568-nvr-demo-v10-spi-nand: disabled pcie for v10 borad
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: If25306404edc6bad153ed48a1b3786f14f71dc76
2021-07-06 19:23:38 +08:00
Zorro Liu
566224b2e8 arm64: dts: rockchip: rk3566-eink: eink mem reserved start from 0x10800000
Since the cma reserved start from 0x10000000, size 0x00800000,
so fix the eink reserved default start from 0x10800000

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Iff6933137e77ac678bb7dd815968a9d447476623
2021-07-06 19:23:38 +08:00
Wu Liangqing
021bf9b314 arm64: dts: rockchip: add not-save-power-en to rk356x board
fix reboot block as follows log:
[   15.874382] binder: release 247:268 transaction 4234 in, still active
[   15.874418] binder: send failed reply for transaction 4234 to 395:455
[   15.959849] binder: undelivered TRANSACTION_ERROR: 29189
[   16.085993] binder: 147:147 transaction failed 29189/-22, size 100-0 line 3059
[   16.128154] android_work: sent uevent USB_STATE=DISCONNECTED
[   16.145570] logd.klogd: 24 output lines suppressed due to ratelimiting
[   16.690141] cpu cpu0: min=816000, max=816000
[   16.696558] rk808 0-0020: reboot: force RK817_RST_FUNC_REG ok!
[   33.769778] vcc5v0_otg: disabling
[   33.770099] vcc3v3_lcd0_n: disabling
[   33.770424] vcc3v3_lcd1_n: disabling
[   37.699768] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
[   37.700342] rcu: 	3-...0: (0 ticks this GP) idle=b52/1/0x4000000000000000 softirq=4194/4194 fqs=2012
[   37.701150] rcu: 	(detected by 0, t=6302 jiffies, g=3301, q=16)
[   37.701684] Task dump for CPU 3:
[   37.701981] init            R  running task        0     1      0 0x0400000a
[   37.702609] Call trace:
[   37.702851]  __switch_to+0xe4/0x138
[   37.703166]  lock_timer_base+0x5c/0xa0
[   37.703502]  try_to_del_timer_sync+0x30/0x98
[   37.703883]  del_timer_sync+0x50/0x60
[   37.704220]  schedule_timeout+0x19c/0x478
[   37.704582]  clk_gate_endisable+0x2c/0xc8
[  100.716421] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
[  100.716991] rcu: 	3-...0: (0 ticks this GP) idle=b52/1/0x4000000000000000 softirq=4194/4194 fqs=7921
[  100.717799] rcu: 	(detected by 0, t=25207 jiffies, g=3301, q=19)
[  100.718334] Task dump for CPU 3:
[  100.718632] init            R  running task        0     1      0 0x0400000a
[  100.719260] Call trace:
[  100.719500]  __switch_to+0xe4/0x138
[  100.719816]  lock_timer_base+0x5c/0xa0
[  100.720152]  try_to_del_timer_sync+0x30/0x98
[  100.720533]  del_timer_sync+0x50/0x60
[  100.720870]  schedule_timeout+0x19c/0x478
[  100.721231]  clk_gate_endisable+0x2c/0xc8
[  163.733075] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
[  163.733643] rcu: 	3-...0: (0 ticks this GP) idle=b52/1/0x4000000000000000 softirq=4194/4194 fqs=13833
[  163.734462] rcu: 	(detected by 0, t=44112 jiffies, g=3301, q=20)
[  163.734997] Task dump for CPU 3:
[  163.735294] init            R  running task        0     1      0 0x0400000a
[  163.735921] Call trace:
[  163.736160]  __switch_to+0xe4/0x138
[  163.736475]  lock_timer_base+0x5c/0xa0
[  163.736811]  try_to_del_timer_sync+0x30/0x98
[  163.737192]  del_timer_sync+0x50/0x60
[  163.737528]  schedule_timeout+0x19c/0x478
[  163.737889]  clk_gate_endisable+0x2c/0xc8

Change-Id: I663b6b3e0b081ad17bf2845629b34e2ec9d2d76d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-07-06 19:23:38 +08:00
Zorro Liu
6c6ebeeb80 arm64: dts: rockchip: rk3566 eink: set sdio default sample phase to 90
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I69635ba3ec8456137bfc47de402b0bfc1c29a327
2021-07-06 19:23:38 +08:00
Zorro Liu
24c2ee2941 arm64: dts: rockchip: rk3566-eink.dtsi: adjust dmc freqs and voltage
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I72cea2c6040b48729a7ff24effe47b0cd1b71736
2021-07-06 19:23:38 +08:00
Wu Liangqing
440e633c18 arm64: dts: rockchip: rk3568-evb: enabled rknpu_mmu
This reverts commit 8fc4d4d9b6 ("arm64: dts: rockchip: rk3568-evb:
Add reserved memory for rknpu").

Change-Id: I3d4c24266f7c52c311956adec9b1b1f42b7370a6
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-07-06 19:23:38 +08:00
Zorro Liu
abb167c18e arm64: dts: rockchip: rk3566-rk817-eink-w103.dts: remove npu
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I23495b013e6687d5a64f77d95433e6152cd98be7
2021-07-06 19:23:38 +08:00
Wu Liangqing
caa4b6d181 arm64: dts: rockchip: rk3566-tablet: set dcdc_boost min 5v
Solve the problem of insufficient power supply voltage of
USB peripheral

Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I7e06b463a2da567fcf8fa2fc641379d9274ed549
2021-07-06 19:23:38 +08:00
Huang zhibao
4de0aee47a arm64: dts: rockchip: rk3566-box: update usb host0/1 config
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: If948a5f33020ab62261aba7d63acdb10201768fe
2021-07-06 19:23:38 +08:00
Wu Liangqing
eca54de333 arm64: dts: rockchip: rk356x-evb enabled work led
Change-Id: Id5ab430ae0b417646e416ee894929ee4e45f05f5
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-07-06 19:23:38 +08:00
Huang zhibao
472b08b6d3 arm64: dts: rockchip: rk3566-box: remove regulator-always-on from usb otg regulator
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I66b8af4d1961e6cbb1e11ae9a2ed5d74bd35a50b
2021-07-06 19:23:37 +08:00
Huang zhibao
19123919d1 arm64: dts: rockchip: rk356x: remove pwm interrupts define from products dtsi
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Id89aa2fb8f368fad504ce5efd4e1ed20e1335fa3
2021-07-06 19:23:37 +08:00
Huang zhibao
babb9f13ce arm64: dts: rockchip: rk3568-nvr: add rk618 hdmi support
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: If3f14ba1d3f9599fd3be967110aa9cf7684b2cd9
2021-07-06 19:23:37 +08:00
Wenping Zhang
72f1af4839 arm64: dts: rockchip: change mmc aliases for rk356x in android platform.
Rechange the emmc aliase to mmc2 to be same as other rockchip's chips,
so the android application can process the emmc property of all chips
in a uniform manner.

Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Ia092ec08552e360e7fc5dc271dbb69edc08bd486
2021-07-06 19:23:37 +08:00
Jianqun Xu
3618cb49ea arm64: dts: rockchip: rk3568-android: reserved cma default at 256M
The usb driver will alloc from the cma default memory pool, when it's
limited to 32bit, the cma default memory should limit to dma32.

Change-Id: Ibd91f3158af6eae98d899018685e03e8f47e75a9
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-07-06 19:23:16 +08:00
Finley Xiao
091e8a1173 arm64: dts: rockchip: rk3568: Add vop-bw-dmc-freq property for dmc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I20367d84fa3fee5b008ea8fbaba33ec296dd2721
2021-07-06 18:59:22 +08:00