* commit '40fac1a66ccf61bdf3afb70c18a5db7791410b22': (220 commits)
Revert "tee: optee: interrupt an RPC when supplicant has been killed"
Revert "tee: optee: interrupt an RPC depend on shutdown flag"
arm64: dts: rockchip: rv1126bp-evb-v14: Adjust the matching voltage
media: rockchip: aiisp: delete one temp buffer to reduce memory
media: rockchip: isp: mp output buf notice to aiisp
media: rockchip: aiisp: modify for aiynr algo
rtc: rockchip: add ready flag for rtc setting time
soc: rockchip: cpuinfo: export chip unique id to userspace
media: rockchip: vpss: offline mode support auto unite output
drm/rockchip: vop2: Add "DIMMING_DATA" property for local dimming
media: rockchip: isp: aiisp switch for offline mode
media: rockchip: isp: aiisp switch for isp35
media: rockchip: isp: support aiisp yuv mode
input: touchscreen: gt1x: prefix global variables and functions with "gt1x_"
MALI: valhall: add gpu mem sysfs entry
drm/rockchip: Make the DRM panel as part of Rockchip DRM sub devices for panel loader protect
drm/rockchip: Pass struct rockchip_drm_sub_dev for &rockchip_drm_sub_dev.loader_protect()
pwm: rockchip: Add &rockchip_pwm_chip.oneshot_valid to indicate validity of configurations
pwm: rockchip: Add comments for why to add delay before disabling the dclk for PWM v4
input: touchscreen: hyn: reduce logs
...
Change-Id: I1b562efca0842173010b2506231d7200a5116e5a
HDMI-IN app require up to 5 buffers, about 118M.
The system may borrows some CMA memory cause errors.
Add more CMA memory to avoid problems.
Change-Id: Ifa03edef13604fc8ca1d26cd00f7fe4fce81b6da
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>