Commit Graph

605822 Commits

Author SHA1 Message Date
Jung Zhao
72e811bb5c video: rockchip: vpu: fix kfree bug
there is a global session which use devm_kzalloc when
vpu probe, and each open function will create a session
use kzalloc. now use kzalloc to malloc for both of them
to avoid kfree bug.

Change-Id: I4012463cea5b3becaf2640b407f1ba93c9766008
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-20 15:23:42 +08:00
Algea Cao
824179b35e drm/bridge/synopsys: Report hdmi HPD to userspace for cec
When hdmi HPD is occurred, call cec_notifier_repo_cec_hpd.

Change-Id: If2047121c8ccf55e9a49fa4c3c4ec2187248a593
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-01-20 15:21:24 +08:00
Jung Zhao
92cd6903dc video: rockchip: vpu: stride err for jpeg encode
Change-Id: Ife4d21c8361275d8832e0c1e3439c945c236d625
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-19 18:06:00 +08:00
Finley Xiao
ed28e4ee25 ARM: dts: rockchip: rk322x: Add rkvdec and vpu qos node
The rkvdec and vpu qos registers need to save and restore when reset.

Change-Id: I2c335a0df922463d2ecf37fe1ee250aadc3b7c54
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-19 14:46:04 +08:00
Finley Xiao
ae862e081b ARM: dts: rockchip: rk322x: add power domain node for RK322x Soc
Change-Id: Iffc561003818d2190a4d9c9ac4196aa9437c5d7e
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-19 14:45:31 +08:00
Finley Xiao
6d64d2dc10 soc: rockchip: power-domain: Modify power domain driver for rk3228
This driver is modified to support RK3228 SoC.
RK3228 SoC is only support idle.

Change-Id: I1c3e942de13fd241e3893818e2584c25bad69b27
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-19 14:44:34 +08:00
Liang Chen
e41e830c25 arm64: dts: rockchip: correct irq trigger type of timer for px30
Change-Id: I36b430cc718f9a7625d1fba2d2393500fdb7a9d6
Signed-off-by: Liang Chen <cl@rock-chips.com>
2018-01-19 14:26:09 +08:00
Zhou weixin
cc4cba8694 arm64: rockchip_defconfig: enable CONFIG_TOUCHSCREEN_GT1X for px30/3326 evb
Change-Id: I6b2b7a1f8e0a5dbbe498062b4bf65313382dce7c
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-01-19 14:25:09 +08:00
Jung Zhao
ab898a38ba video: rockchip: vpu: fix shutdown mutex_unlock bug
unlocking reset_lock is not necessary at vcodec_shutdown.

Change-Id: Id8331fead9db0968779ef19602f4a24fc9446a7d
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-19 08:23:33 +08:00
Jung Zhao
5abf157e56 video: rockchip: vpu: add VCODEC_RUNNING_MODE_HEVC for hevc
first version of rkvdec is called hevc, and it is dev_mode
is 1, add this value inside get_hw_info function

Change-Id: I0471d167029274848c00a806f0f6f0ea9f0308df
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-19 08:18:53 +08:00
Zhou weixin
9d44f5ccfc input: touchscreen: add gt1x driver
Change-Id: Ic4c5abf51c3dd5383bdc91029afbc7c903c2093a
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-01-18 18:14:34 +08:00
Finley Xiao
d51addcefb arm64: dts: rockchip: rk3328: Add devfreq property for rkvdec
Change-Id: I819a2c950b8b0a31207f85029c61c5efb5afe622
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-18 16:55:24 +08:00
Algea Cao
e764efb524 media: cec: Set kernel not do retransmit
HDMI protocol does not allow retransmit more than
five times when send cec message failed. In android
system, we do retransmit in framework only.

Change-Id: I7bd1a4aa48874be11e4948d60e0c36077268c1c9
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-01-18 16:54:35 +08:00
Algea Cao
cef745a23a media: cec: Add an interface for hdmi report HPD
Add cec-notifier interface that hdmi can call it when
HPD is occurred.

Change-Id: I0087a879bf3ba65e300c3db3a67ddaa7e22f16ad
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-01-18 16:53:37 +08:00
Algea Cao
f968cdb99b arm64: rockchip_defconfig: enable hdmi cec
Change-Id: Iab18a140f11045362dafef9e1d724a3fae6137a0
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2018-01-18 16:53:04 +08:00
Finley Xiao
8b31d4d2da clk: rockchip: px30: Modify clk tree according to latest document
Change-Id: Ib8d983509792b13c1cc84c78af0f572b89053cc7
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-18 16:52:22 +08:00
Finley Xiao
886cb9ab59 video: rockchip: vpu: Add support to register devfreq notifier
Change-Id: I4eb90e61103784b55d7d3bdcfd31d1353174499c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-18 16:47:55 +08:00
Jung Zhao
9e51a32245 video: rockchip: vpu: avoid dead lock
1. when doing vpu_reset and now a ioctl to get reg come,
maybe cause dead lock.
2. remove unused code in try_set_reg function

Change-Id: Ied1f3b606767faa4ccdb9926679df765af258795
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-18 14:30:00 +08:00
Rocky Hao
fa427f4dbf arm64: dts: rockchip: px30: add tsadc node
Change-Id: I7b5d63b37b3c3de19e95e56856dff4ed51089b3f
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-18 14:24:25 +08:00
Rocky Hao
b7dca1ff57 thermal: rockchip: add tsadc support for px30
Change-Id: I46ac8ebd4a92367acb610fb96c18a487c67602d4
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-18 14:24:19 +08:00
xuhuicong
0181dc0e9c drm: bridge: dw-hdmi: disable scamble when tmdsclk less than 340Mhz
to Improve signal compatibility disable scamble when tmdsclk less than
340Mhz by default. and can enable it by define "scramble-low-rates;"
in dts file.

Change-Id: I0bd5d8e2ea4df065d84018615d4c39cac7ac441a
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2018-01-18 10:03:23 +08:00
xuhuicong
15939ad840 drm: bridge: dw-hdmi: enable prepclk to fix 480i and 576i no display
Change-Id: Ie2fc362c4a3c6ce65d247898342f59977c48ab44
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2018-01-18 10:04:29 +08:00
Sandy Huang
75f953253b drm/rockchip: implement shutdown function
implement shutdown to make sure display will be closed
when box product power off.

Change-Id: I860a768a061082bf35bcd53c7dde153e6109f42d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-17 19:26:26 +08:00
Sandy Huang
c1b0a95f96 drm/rockchip: rk3328 vop: set frame effect when in interlace mode
we must make sure the pre overlay is configed at frame start time,
so we set frame effect for interlace mode.

Change-Id: Id85da3afe850d01d985573df9ac37d4b67ef8ddd
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-17 19:26:26 +08:00
XiaoDong Huang
24c39fdbf9 soc: rockchip: virtual poweroff: not pass pwrkey code to ATF
If it supports "remotectl parse" after system resume,
the remotectl driver would pass pwrkey code to atf.
So we don't need do it again.

Change-Id: Ia73a4fe314e476d551113b111df4bc42b7867ee0
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-01-17 16:19:52 +08:00
Zhang Zhijie
50b2d1bb0f arm64: dts: rockchip: px30: add firmware and optee node
Add optee node to supply OP-TEE required properties.
/optee node is supposed to be below /firmware node.

Change-Id: I0737e7ef3cb495d1fae6354baf66c600fb02fc2f
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2018-01-17 09:43:36 +08:00
Sandy Huang
d470a21701 drm/rockchip: rk3036 vop: set win1 plane type to overlay layer
Change-Id: I893b92ae30c4cf9ac63ac7819cfd6ff2d668bc6a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-16 16:52:46 +08:00
Wyon Bi
e213d25800 drm/rockchip: dsi: skip dw_mipi_dsi_phy_init if it's Non-SNPS PHY
Change-Id: I8a9de5b57e2560a31b9e80c46ebb99e3609d849b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-16 14:37:16 +08:00
Wyon Bi
d46f702116 drm/rockchip: dsi: make some structures const
Change-Id: I11eab81003f3d5680e319de6c83e9984ab338092
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-16 14:35:53 +08:00
Wyon Bi
e2b7cf558f drm/rockchip: dsi: fix vendor specific prefix
Change-Id: Ic554b1a3888af7f63386f5851f2147264d1d9ca2
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-16 14:35:52 +08:00
Putin Lee
6c68372809 arm64: dts: rockchip: add rga node for px30/rk3326
Change-Id: Ib6029de1a54ed88f17447bcdf1e7a52efc0bcd26
Signed-off-by: Putin Lee <putin.li@rock-chips.com>
2018-01-16 14:24:23 +08:00
Finley Xiao
264bd6528c arm64: dts: rockchip: rk3328: Add clocks for pd_vpu and pd_video
Change-Id: Ib90efd922c77da14e61a4ebd093fe0a173264cef
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-16 14:21:51 +08:00
xuhuicong
f667806cdb drm/rockchip: dw-hdmi: filter color format which is no support
there are maximum TMDS clock limit, when the clock is out of range
reducing frequency by set color format to yuv420 and/or set color
depth to 8bit

Change-Id: I8b79de97329561bf0399d05c0264a5c818f844fc
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2018-01-16 14:21:04 +08:00
XiaoDong Huang
54386a3651 arm64: dts: rk3328-evb-android: support virtual poweroff
Change-Id: Id58037cb603a4dbf4f62a1b7f0c5976bbe692c26
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-01-16 14:14:06 +08:00
XiaoDong Huang
2efe06b6f2 arm64: dts: rk3328: add rockchip-suspend node
Change-Id: Ie0758bf8d3a25696980edba5ba34ddd1e1034d95
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-01-16 14:13:22 +08:00
Wyon Bi
ace15b7c51 arm64: dts: rockchip: Enable display output on px30 evb board
Change-Id: I41f72418e405d5c52fdb5cd19b1cb6b3eb2cff0f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-15 20:43:59 +08:00
Wyon Bi
6a36cb465f arm64: dts: rockchip: Enable display output on rk3326 863 board
Change-Id: I6279b56e380510fbfb5ea8858fe623fbfebaa0a8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-15 20:43:43 +08:00
Wyon Bi
e618467937 arm64: dts: rockchip: Enable display output on rk3326 evb board
Change-Id: I6cc78f6c9178f45d2e8c913179eb8d2df4fd7803
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-15 20:43:27 +08:00
Wyon Bi
9613210170 arm64: dts: rockchip: px30-android: add route_dsi
Change-Id: I5cd9c90101b567edf696ad681a47ec89c62f858c
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-15 20:43:05 +08:00
Wyon Bi
d0038ad635 arm64: dts: rockchip: px30: add pinmux definitions for lcdc
Change-Id: I6849bbc570256f40f645d141adb4e12615fbcbcc
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-15 20:42:56 +08:00
Sandy Huang
35e54ad72a drm/rockchip: rk3328 vop: fix background color error
This is for IC design not reasonable, when enable preoverlay and only
enable win0 for yuv format, the win0 no display area will be considered
as yuv domain black color, this lead to the no display area display
pink color.

Change-Id: I46a860c3753af2aa2a0900db0d48832e1624c948
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-15 16:51:32 +08:00
Sandy Huang
3bedb7539c drm/rockchip: rk3328 vop: fix per-pixel alpha * global alpha issue
when enable hdr2sdr on rk3328, vop can't support
per-pixel alpha * global alpha, so we must back to gpu,
but gpu can't support hdr2sdr, so gpu output hdr UI(rgbx),
vop will do:
	UI(rgbx) -> yuv -> rgb ->hdr2sdr -> overlay -> output.

Change-Id: I69fdfacbf13e755b6fa8b1570c74da027bab52fb
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2018-01-15 16:51:17 +08:00
XiaoDong Huang
075df03bcd soc: rockchip: support rk3328 pm config
Change-Id: If19dba160fbfdce147e1c851c5cc424d08e0c4fd
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-01-15 16:46:32 +08:00
Jung Zhao
99b35196db video: rockchip: vpu: add qos save/restore when vpu_reset
Change-Id: I138c4efd1ca244b7cbf067ae9ef11b326af02e45
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-15 16:42:23 +08:00
Jung Zhao
bdbe4855fb video: rockchip: vpu: do vpu_reset after err immediately
1. do vpu_reset immediately when err occur
2. fix power ops bug

Change-Id: I939101167d84d18f1b73b3b3da74a05093f35d20
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2018-01-15 16:42:18 +08:00
xuhuicong
87b681f969 drm/bridge: dw-hdmi: fix display shaking when uboot to kernel show
Change-Id: I899bb0dde7111fe97dd2c89d20afb09562d31300
Signed-off-by: xuhuicong <xhc@rock-chips.com>
2018-01-15 14:11:16 +08:00
Finley Xiao
fcd8fb300b arm64: dts: rockchip: rk3366: Add qos nodes
when pd power on/off, the qos regs need to save and restore.

Change-Id: I55739fb8f2b452702bdbdc974bd588bbc05848d7
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-15 11:24:35 +08:00
ZhuangXiaoLiang
0b1ffe2eb4 RK3368 GPU: Fix strcpy warning.
Change-Id: I0e53c845b9073bacffdbdcb875c7124dd812c6be
Signed-off-by: ZhuangXiaoLiang <zhuangxl@rock-chips.com>
2018-01-12 19:36:57 +08:00
Zhou weixin
05ba6262c6 Rockchip: vip: add gc0312 driver
Change-Id: I2cc81469f48b35833832ff102b45221ea340f5a9
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-12 19:31:29 +08:00
Shunqing Chen
797d668f5c arm64: dts: rockchip: rk3368-sziauto: add rk618 HDMI support.
Change-Id: Ib5795febf1c5432d12988bfb5e9b86345513ef6d
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-12 19:21:18 +08:00