Commit Graph

605794 Commits

Author SHA1 Message Date
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
Sugar Zhang
a8631575d8 ASoC: rockchip: rk3328: add mclk for internal codec
Change-Id: I1fef0d0d7d7f7ef04531a33d8ff6ccebea1d1c7c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-01-12 19:19:51 +08:00
Sugar Zhang
fa385769cb arm64: dts: rockchip: rk3328: add mclk for internal codec
Change-Id: I3a29c25af0fa58f97f5dd8345b91df48f4f087ff
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2018-01-12 19:19:29 +08:00
Rocky Hao
0ea4217387 PM / devfreq: rockchip_dmc: init and update last_status
Last_status is used to calculate dmc's power in thermal control.
If last_status is neithor inited nor kept updated, the power model will
get the wrong status and then the wrong power. And dmc gets wrong
cooling state at last.
Meanwhile this issue reports the  warning "core: dev_pm_opp_get_voltage
: Invalid parameters"

Change-Id: Ic371796ad94fd6dab376fefbea91adff0068d26b
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-12 19:17:11 +08:00
Finley Xiao
336773f36d ARM: dts: rockchip: rk3036: Add vpu qos node
The vpu qos registers need to save and restore when reset.

Change-Id: I649cf4a360842ad1abb06c35a6fd8d3868fbf706
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-12 19:11:50 +08:00
Finley Xiao
e3db9462f8 arm64: dts: rockchip: rk3328: Add rkvdec and vpu qos node
The rkvdec and vpu qos registers need to save and restore when reset.

Change-Id: If0fbee0aed9227cfd795c5f439cfb8c3b2f0ccaf
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-01-12 19:11:42 +08:00
Wyon Bi
313564d931 drm/rockchip: dsi: support non-continuous clock behavior
This bit enables the automatic mechanism to stop providing clock in
the clock lane when time allows.

Change-Id: Ia3d85589f54adcf6206ee7ded32624b8e92936af
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-12 15:03:33 +08:00
Shunqing Chen
9ff817b7ab drm/rockchip: inno_hdmi: add support for rk618
Change-Id: Ic4fcfbc9adec378c67666455e45ae581e3a46ecd
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-12 15:03:05 +08:00
Rocky Hao
5172573fa1 PM / devfreq: rockchip_dmc: optimize thermal control code
use framework internal dynamic power calc function. Do not use
global data, rk_dmcfreq.

Change-Id: I1f46b2471b5d25a9233724fdd61efe63ea13b860
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2018-01-12 14:30:19 +08:00
Zhou weixin
d49822a34a arm64: rockchip_defconfig: add CONFIG_TOUCHSCREEN_GSL3673_800X1280
Change-Id: I2b1af38803b36c45ba0287b325e0db5ed5abcb95
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-12 14:21:58 +08:00
Zhou weixin
d1ce97ac91 input: touchscreen: gsl3673: add tp driver for rk3326 f863 board
Change-Id: I9aef5a8972887782c8becf6ddba3bc3649cb82fa
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-12 14:21:46 +08:00
Jacob Chen
77c621e531 ARM: dts: rk3288-miniarm: enable rkisp1 and add imx219/ov5647
Change-Id: Ifb9c18be4cc7fc3d663101c41e3c0be9eff513d4
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 17:16:08 +08:00
Zhou weixin
e2346cddf0 arm64: dts: rockchip: add some peripheral configuration for px30/rk3326
devicelist: backlight\key\wifi\bt\sdmmc\touchpad\gsensor\fiq

Change-Id: I303c91ebca0b6d2ec9d452395e470fdd574e6fef
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
2018-01-11 16:53:52 +08:00
Wyon Bi
714abae67e drm/rockchip: rk618: vif: Convert to drm_bridge
Change-Id: I124bfabf7fe67854f55aef5fec0cad00cd5e2eac
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:52:00 +08:00
Wyon Bi
08d59c7d52 mfd: rk618: add vif subdev
Change-Id: Ib2516da15406e232d5836f7476db935e7343d7d8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:50:11 +08:00
Wyon Bi
99d81a6554 arm64: dts: rockchip: Add dsi node for PX30
Change-Id: Idf22f326c457c6b658269070b4fd2d5e71a9f62f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:48:50 +08:00
Wyon Bi
886d0dc582 arm64: dts: rockchip: Add mipi_dphy node for PX30
Change-Id: I92c6bfe60dfe0c89befddad528c8d41a2318567a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:48:20 +08:00
Wyon Bi
dffc889042 phy/rockchip: dphy: Add support for PX30
Change-Id: Ia7e29691f66fa10a5cdf1379b4eb419581ddda5f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:45:24 +08:00
Wyon Bi
faa3764d61 drm/rockchip: dsi: Add support for PX30
Change-Id: Ib7e43456d8456b1db74880710b88bdf7da4639e8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:44:58 +08:00
Wyon Bi
371553e68b drm/rockchip: dsi: Add a better description for dw_mipi_dsi_plat_data
Change-Id: I6a149747a12bbd1c3e84cd33769ed453770353af
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-01-11 16:44:26 +08:00
Jacob Chen
fbe1b71c32 media: i2c: imx219: apply gain/exposure immediately
or it's too slow for AEC algorithm

Change-Id: I646a31b026a1e753e8bee681d088c7b2944ed147
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:48 +08:00
Jacob Chen
e9b2399061 media: i2c: imx219: support 1920*1080*48fps mode
and correct some control to make 3A work

Change-Id: Id3fc3ca9c5b123b6d45cd80d8e857a5c151c2427
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:46 +08:00
Jacob Chen
05ffa6bb37 ARM: configs: rockchip_linux: enable rockchip isp1 driver
and some sensors

Change-Id: I8be884069341680c09c7bccd0e17b6faff0a681b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:43 +08:00
Jacob Chen
2e65cfc38f ARM: dts: add rk3288-firefly-reload-linux
tc358749 enabled with rockchip-isp1 driver

Change-Id: I94c36f2d78cb190436e974bd47500dbbce18deae
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:30:39 +08:00
Jacob Chen
2f45de6bee ARM: dts: add rk3288-rkisp1.dtsi
There are many isp driver in 4.4 kernel, let's add a dtsi
to help switch between them.

Change-Id: Ida1af575b6c64ffec56ad695933dfdf22cdd72c1
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
2018-01-11 14:28:28 +08:00
Greg Hackmann
e2a963621b clocksource: arch_timer: make virtual counter access configurable
CVE-2017-13218
Change-Id: Ibdb1fd768b748002b90bfc165612c12c8311f8a2
2018-01-11 10:44:36 +08:00
Greg Hackmann
fe1b88d895 arm64: issue isb when trapping CNTVCT_EL0 access
CVE-2017-13218
Change-Id: I6005a6e944494257bfc2243fde2f7a09c3fd76c6
2018-01-11 10:44:28 +08:00
Marc Zyngier
e35b7d2759 BACKPORT: arm64: Add CNTFRQ_EL0 trap handler
We now trap accesses to CNTVCT_EL0 when the counter is broken
enough to require the kernel to mediate the access. But it
turns out that some existing userspace (such as OpenMPI) do
probe for the counter frequency, leading to an UNDEF exception
as CNTVCT_EL0 and CNTFRQ_EL0 share the same control bit.

The fix is to handle the exception the same way we do for CNTVCT_EL0.

Fixes: a86bd139f2 ("arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled")
Reported-by: Hanjun Guo <guohanjun@huawei.com>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 9842119a23)

CVE-2017-13218
Change-Id: I2f163e2511bab6225f319c0a9e732735cbd108a0
2018-01-11 10:44:13 +08:00
Marc Zyngier
6c970498b3 BACKPORT: arm64: Add CNTVCT_EL0 trap handler
Since people seem to make a point in breaking the userspace visible
counter, we have no choice but to trap the access. Add the required
handler.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
(cherry picked from commit 6126ce0588)

CVE-2017-13218
Change-Id: I0705f47c85a78040df38df18f51a4a22500b904d
2018-01-11 10:42:02 +08:00