1. update rockchip tiled modifier format define;
2. add rockchip rfbc modifier format define, rfbc is rockchip
framebuffer compression format, it's will supported by rockchip
video decoder, RGA and VOP modules, and the superblocks size is 64x4.
Fixes: f727d3ad8e ("drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ice06eda4819254ba670a7231836cabe46bc38137
Merge using ours merge strategy.
* commit '534dc2d08b251dc7d13aa005626ed3b6fddf389f':
media: rockchip: vicap support capture raw online with only one buffer
Change-Id: Ia0f1bd6381a643d251b09f5af2a51759d036063b
* commit 'af37f2152d1bdc8e2859810c51bc441bf67e780d':
media: rockchip: vicap fixes suspend/resume
phy: rockchip: mipi csidphy fixed register of write/read out of range
Mali: bifrost: log: Add task_comm of contexts in OOM notification log
Mali: bifrost: log: Add pid and task_comm of contexts in the info read from node "gpu_memory"
arm64: configs: px30_linux_defconfig: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
phy: rockchip: mipi-dcphy: fix null point cause reboot issue
BACKPORT: pinctrl: rockchip: fix reading pull type on rk3568
ASoC: rockchip: sai: Use DMC-DVFS-SCENE for HBR audio
ASoC: rockchip: i2s: Use DMC-DVFS-SCENE for HBR audio
Change-Id: Ibecb4b81024dfd6ad6df341784ca637b2b0c270a
* commit 'adb52b660051c9ff11d4509a807035f9d952a27a':
ASoC: rockchip: i2s-tdm: Use DMC-DVFS-SCENE for HBR audio
ASoC: rockchip: Introduce rockchip utils common API
mtd: spinand: xtx: Support new device XT26G0xDWSIGA
PM / devfreq: rockchip_dmc: support get dmcfreq stall time
Change-Id: I16ba5a625b339e3dbcd8628a2b48266c783ae68f
Conflicts:
sound/soc/rockchip/rockchip_i2s_tdm.c
* commit '059a18f32f1db89e019885d2c9786dfe9b65ca3c':
misc: rockchip: pcie-rkep: Support clear id for pcie_rkep_release
misc: rockchip: pcie-rkep: Support raising ep elbi int by ioctl
misc: rockchip: pcie-rkep: Support adding virtual id by ioctl
serial: 8250_dma: fix bug when tx dma is enable
arm64: dts: rockchip: rk3588-vehicle-evb: improve lcd init of serdes display
mfd: display-serdes: add soft reset and delay control support
ARM: configs: rockchip: update rv1106-wakeup.config
ARM: dts: rockchip: update rv1106g-evb2-v12-wakeup
Change-Id: I5c1687d7bab6e49ad160245f40df571090d7e0ed
Set input direction to avoid FLAG_IS_OUT in gpiochip_lock_as_irq
Fixes: adc8b4bf2a ("gpio: rockchip: lock GPIOs used as interrupts")
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ib5bb752b410894cd0fd9694f332f902d07ca9701
1. update rockchip tiled modifier format define;
2. add rockchip rfbc modifier format define, rfbc is rockchip framebuffer
compression format, it's will supported by rockchip video decoder, RGA and VOP
modules, and the superblocks size is 64x4.
Fixes: f727d3ad8e ("drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ice06eda4819254ba670a7231836cabe46bc38137
Allow the DRM ignore some permission issues.
Change-Id: Id0b5287001bdb3ee91a97cfd58ef93fe2c3fc829
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
In camera preview state, press the power button to standby,
then press the power button immediately to wake up,
machine will reboot, so fix it.
Call trace:
samsung_mipi_dcphy_power_on+0x68/0xc80 [phy_rockchip_samsung_dcphy]
phy_power_on+0xa4/0x124
dw_mipi_dsi2_pre_enable+0x350/0x364 [rockchipdrm]
dw_mipi_dsi2_encoder_atomic_enable+0x308/0x3d0 [rockchipdrm]
drm_atomic_helper_commit_modeset_enables+0x158/0x2ec
rockchip_drm_atomic_helper_commit_tail_rpm+0x50/0x2f8 [rockchipdrm]
commit_tail+0xbc/0x170
drm_atomic_helper_commit+0x1f4/0x218
drm_atomic_commit+0xbc/0xec
drm_mode_atomic_ioctl+0x59c/0x70c
drm_ioctl_kernel+0xf8/0x184
drm_ioctl+0x2cc/0x528
__arm64_sys_ioctl+0xa8/0xe4
invoke_syscall+0x58/0x11c
el0_svc_common+0xb4/0xf4
do_el0_svc+0x2c/0xb0
el0_svc+0x2c/0xa4
el0t_64_sync_handler+0x68/0xb4
el0t_64_sync+0x1a0/0x1a4
Code: 95d7b2de b9408a68 34000b48 f9403e76 (f9407ad4)
---[ end trace 0000000000000000 ]---
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ie15e7cef29821683731d56ff5c4ceb924e340bb5
When reading pinconf-pins from debugfs it fails to get the configured pull
type on RK3568, "unsupported pinctrl type" error messages is also reported.
Fix this by adding support for RK3568 in rockchip_get_pull, including a
reverse of the pull-up value swap applied in rockchip_set_pull so that
pull-up is correctly reported in pinconf-pins.
Also update the workaround comment to reflect affected pins, GPIO0_D3-D6.
Fixes: c0dadc0e47 ("pinctrl: rockchip: add support for rk3568")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Jianqun Xu <jay.xu@rock-chips.com>
Link: https://lore.kernel.org/r/20230110172955.1258840-1-jonas@kwiboo.se
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f8ac5467e1)
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I8c6a115f1c6c62b734f76487a0ace63f4bc43743
This patch Use DMC-DVFS-SCENE policy for High Bitrate Audio.
Ref: commit 5f0eb1c57240 ("ASoC: rockchip: Introduce rockchip utils common API")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9b919a8b2ebc85400eafb4229cd9f70b2df2bd9b
This patch Use DMC-DVFS-SCENE policy for High Bitrate Audio.
Ref: commit 5f0eb1c57240 ("ASoC: rockchip: Introduce rockchip utils common API")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I58a34020fabbddd7f47a5831b3a33c6f81118fe1
At the monment, we add utils_get/put_performance for
DMC-DVFS-SCENE policy.
Ref: commit cae65d78f0 ("ASoC: rockchip: i2s-tdm: Add support for FIFO-XRUN detection")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I188e5cfff960aa3679db5c3a8ee847d9c7b685ee
This patch Use DMC-DVFS-SCENE policy for High Bitrate Audio.
Ref: commit 5f0eb1c57240 ("ASoC: rockchip: Introduce rockchip utils common API")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9492fa993b6095f53f253615304ec445ac9cb53f
Cannot use android_device to get multiple android instances.
The cdev will not be freed by the set_gadget_data(gadget, NULL),
so we can do not use the spinlock of gadget item to prevent
the condition.
Bug: 298603473
Fixes: dd139186ef ("ANDROID: usb: gadget: fix NULL pointer dereference in android_setup")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: Ic0c72971051401d218e2eba75c40194933290e16
When three threads run on three different cpu, and write
60 byte to the same uart at the same time, which causes
the data loss. After test, it is caused by DMA bursts 16 byte
when the fifo is more than 48 byte(fifo total 64 byte).
It is solved by clearing the uart dma request before start
dma tx.
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I4e2099337e25e41a34ceeb9ea774a04cc7c71f07
* commit '6971f2340a338d235d0227336beff69f6573d032':
arm64: dts: rockchip: rk3562: Add pm_shaping for power domains
soc: rockchip: power-domain: Add support to save and restore shaping
Change-Id: I82b6d65334ad4740405dee7975faf86f7a529ead
