Commit Graph

615442 Commits

Author SHA1 Message Date
Ville Syrjälä
0c17d3a6a0 UPSTREAM: drm/edid: Set YQ bits in the AVI infoframe according to CEA-861-F
CEA-861-F tells us:
"When transmitting any RGB colorimetry, the Source should set the
 YQ-field to match the RGB Quantization Range being transmitted
 (e.g., when Limited Range RGB, set YQ=0 or when Full Range RGB,
 set YQ=1) and the Sink shall ignore the YQ-field."

So let's go ahead and do that. Perhaps there are sinks that don't
ignore the YQ as they should for RGB?

I wasn't able to find similar text in CEA-861-E, so it would seem
to be a fairly "recent" addition.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170111125725.8086-6-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit fcc8a22cc9)

Change-Id: I355b86175d2b33e88bd384a01f7e6378b21d13fd
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-03-08 08:49:30 +08:00
Ville Syrjälä
2b882c1f35 UPSTREAM: drm/edid: Set AVI infoframe Q even when QS=0
HDMI 2.0 recommends that we set the Q bits in the AVI infoframe
even when the sink does not support quantization range selection (QS=0).
According to CEA-861 we can do that as long as the Q we send matches
the default quantization range for the mode.

Previously I think I had misread the spec as saying that you can't
send a non-zero Q at all when QS=0. But that's not what the spec
actually says.

v2: Fix typo in commit message (Jani)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170111125725.8086-5-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit 779c4c2866)

Change-Id: Ic006e2a2a9ac2f1ab105c595bc4a62c0918c6dff
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-03-08 08:49:30 +08:00
Ville Syrjälä
6255a9fe86 UPSTREAM: drm/edid: Introduce drm_hdmi_avi_infoframe_quant_range()
Pull the logic to populate the quantization range information
in the AVI infoframe into a small helper. We'll be adding a bit
more logic to it, and having it in a central place seems like a
good idea since it's based on the CEA-861 spec.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170111125725.8086-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit a2ce26f815)

Change-Id: Ic41983b3298461644658d89c31408b06efc33c69
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-03-08 08:49:30 +08:00
Ville Syrjälä
738f34027f UPSTREAM: drm/edid: Introduce drm_default_rgb_quant_range()
Make the code selecting the RGB quantization range a little less magicy
by wrapping it up in a small helper.

v2: s/adjusted_mode/mode in vc4 to make it actually compile
v3: Add a comment proposed by Eric

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170111141835.25369-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit c8127cf08a)

Change-Id: I33894c6e3a2033b168f78918e4a8dbf167201632
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2019-03-08 08:49:30 +08:00
Zhang Zhijie
6ff461709c OPTEE: do uart port config when driver probe
Some logs may appear before tee-supplicant start,
so uart port config should be done as early as possible.

Change-Id: I51bdb6a9d0f5160a6dc66ad015577a77df6897b4
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2019-03-07 10:13:22 +08:00
Zhang Zhijie
7757813f89 OPTEE: check psci state when driver init
Kernel is running in secure mode on some platforms(e.g. rk3128/rv1108),
which has no secure OS to support TEE service.

Change-Id: I275413230b2a8ec3864fc5a5ba043a155d724ced
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2019-03-07 10:07:47 +08:00
YouMin Chen
a6a1e20286 PM / devfreq: rockchip-dfi: fix lpddr4 calculation error
Fix lpddr4 calculation error about access.
LPDDR4 BL(burst length) = 16,other DDR type BL(burst length) = 8.

Change-Id: Icc1b4f6764fa0b23ec1f7722bda8ffeff1da4ab7
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2019-03-06 14:58:34 +08:00
Liang Chen
8d976db24b arm: dts: rk3128-fireprime: remove custom cma region@88000000
The address@88000000 is out of memory on rk3128-fireprime, so remove
the cma region@88000000, just delete the property <reg>, so that
system will alloc cma region automatically.

Change-Id: I2b9fdf1cd19d9fcecd59421fd551d709f9054cae
Signed-off-by: Liang Chen <cl@rock-chips.com>
2019-03-06 11:39:07 +08:00
Jianqun Xu
09eb63fae4 arm64: dts: rockchip: rk3399-sapphire remove dvs2
The RK3399 sapphire board hasn't use dvs2 of pmic rk808,
remove it from dts.

Change-Id: I6b18f2ac48d2f32ba53cc6f16303be0f42d74fe5
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-03-06 09:24:16 +08:00
Sugar Zhang
96e7d814e7 dt-bindings: sound: add compatible for rk1808es vad
Change-Id: I9eff5ec7ff87f2c26fdd4264cad1169a42889992
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-03-05 15:33:10 +08:00
Sugar Zhang
1be8a3602e ASoC: rockchip: vad: compatible with rk1808es/rk1808
Change-Id: I54c968f8fcf37cc4d7a52137ac0aac57d4367dc7
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2019-03-05 15:33:10 +08:00
Tao Huang
43dbf7220c arm64: dts: rockchip: disable uart2 for rk3399 board
Change-Id: I0934141d4a943f9bd21f74652c78a4e2eefc1e57
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:48:00 +08:00
Tao Huang
55a2b35ff5 arm64: dts: rockchip: disable uart2 for rk3368-r88-dcdc
ttyS2 and fiq debugger don't use the same uart2

Change-Id: I442bb34a5a9a7c836b01b693b199b82284539ca6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:47:44 +08:00
Tao Huang
5d99473a36 arm64: dts: rockchip: disable uart2 for rk3368-r88
ttyS2 and fiq debugger don't use the same uart2

Change-Id: Id93080187e99089b590cdd29e98713d4e2b50dee
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:47:44 +08:00
Tao Huang
2a2fd97236 arm64: dts: rockchip: disable uart4 for rk3368-px5-evb-android
ttyS4 and fiq debugger don't use the same uart4

Change-Id: I9e73cd663b5a16615e727d65d3e67a2368390615
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:47:44 +08:00
Tao Huang
f1b9929d7d ARM: dts: rockchip: disable uart2 for rk3288-popmetal
Change-Id: Ib4cc44eabe6711efd91cb79867397479ab799ed9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:26:03 +08:00
Tao Huang
6ba0fc8afd ARM: dts: rockchip: disable uart2 for rk3288-phycore-rdk
ttyS2 and fiq debugger don't use the same uart2

Change-Id: I4ca2df8a763f0dba7a28cd9b8e2b32e885feaa0b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:26:03 +08:00
Tao Huang
56dd8723fd ARM: dts: rockchip: disable uart2 for rk3288-miqi
ttyS2 and fiq debugger don't use the same uart2

Change-Id: I40fc4010624abf6b687bc56b739b81b992f9d61a
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:26:03 +08:00
Tao Huang
6de0a2904b ARM: dts: rockchip: disable uart2 for rk3288-fennec
ttyS2 and fiq debugger don't use the same uart2

Change-Id: Id726872e68ef873a77b0a5bf5c60f0525f789b0f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:26:03 +08:00
Tao Huang
746156e739 ARM: dts: rockchip: disable uart2 for rk3288-evb-act8846
ttyS2 and fiq debugger don't use the same uart2

Change-Id: I9c6b26c51174e86621fd8369d9231c7b4d20c89f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:26:03 +08:00
Tao Huang
7d0b5029ca ARM: dts: rockchip: disable uart2 for rk3288 board
ttyS2 and fiq debugger don't use the same uart2

Change-Id: Ia178159f240b30abe29312c8dd94ab4711834bbf
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:26:03 +08:00
Tao Huang
1273e50839 ARM: dts: rockchip: disable uart2 for rk3229-at-som
ttyS2 and fiq debugger don't use the same uart2

Change-Id: Ibb9db5ff84d334d77787ea6f39a0802ba489781c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-05 14:26:03 +08:00
Huibin Hong
8fe83c079f arm64: dts: rockchip: disable uart2 for rk3328-rock64
Change-Id: Iad59c8564b10d429e2bef4c2fe0fd4a9e9ada761
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-03-05 14:09:46 +08:00
Huibin Hong
43d72c2716 ARM: dts: rockchip: disable uart2 for rk3036-kylin
ttyS2 and fiq debugger don't use the same uart2

Change-Id: Ic6d2aa936586869197101593ac9b8056be128406
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-03-05 08:35:17 +08:00
Huibin Hong
13f611e70a fiq debugger: ttyS2 and fiq debugger don't use the same uart2
Someone may enable uart2 and fiq debugger, which is illegal.

&uart2 {
	status = "okay";
};

&fiq_debugger {
	status = "okay";
};

Change-Id: Ibecd3c3ca69de1216103d7c373a4d282cf93cb30
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-03-04 16:33:09 +08:00
Huibin Hong
4aeda7a47f fiq debugger: support dummy console
Maybe you need to use uart2 as normal ttyS2, firstly disable the
uart2 debug function. Set "rockchip,serial-id" as -1, it means
fiq debugger still have a /dev/ttyFIQ0, but it doesn't have any uart
hardware.

&fiq_debugger {
	rockchip,serial-id = <0xffffffff>;
	status = "okay";
};

Change-Id: I80065eed852eb50139520c5c1fdceb882773d79d
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-03-04 16:32:53 +08:00
Leo Wen
33f7355319 arm64: dts: rockchip: Add rk3326-evb-ai-va-v11-linux.dts
Change-Id: I4a363a3f36ac6a7195389b085c59437c2bb66fb6
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
2019-03-04 11:54:13 +08:00
Wyon Bi
8a1a974a86 drm/bridge: analogix_dp: add missing calls to drm_panel_{prepare,unprepare}
If the enable-gpios property of a simple panel in device tree is set,
the GPIO is not toggled on/off because of missing calls to
drm_panel_prepare and drm_panel_unprepare.

Change-Id: I0a191c8bdd05ef8c2d3d41259937cb5ad0b29f08
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-03-04 11:53:14 +08:00
Wyon Bi
31bc0dca0d drm/bridge: analogix_dp: Add support for SSC (Spread-Spectrum Clock)
DPTX implements the programmable SSC down-spreading with up to
0.5% modulation amplitude and 30k/33k modulation frequency.

Change-Id: I2c3eae8f27c84eb1b22eac8973691e0276c1588e
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-03-04 11:53:14 +08:00
Wu Jingchen
1ba631eb8a arm64: dts: rockchip: px30-evb-ext-rk618-avb: Add rule in Makefile
Change-Id: I2b1d636e4be4b7758007ea5d8fbdefb9c040713b
Signed-off-by: Wu Jingchen <oven.wu@rock-chips.com>
2019-03-04 11:47:36 +08:00
Wu Jingchen
2edfd16830 arm64: dts: rockchip: px30-evb-ext-rk618: Create a new dtsi for rk618
Change-Id: I7511599eba331044f8e386dcc5d5840a1eec5457
Signed-off-by: Wu Jingchen <oven.wu@rock-chips.com>
2019-03-04 11:46:43 +08:00
Wu Jingchen
782355187f arm64: dts: rockchip: px30-evb-ext-rk618-avb: Add dts for 9.0 double-screen display
Change-Id: I1d6470d5fe163f8ef59a5ee2593fe2c73e3dbdfa
Signed-off-by: Wu Jingchen <oven.wu@rock-chips.com>
2019-03-04 11:46:04 +08:00
Wu Jingchen
ad8de30335 arm64: dts: rockchip: px30: Add the I2C clock signal strength
Change-Id: I80553627d258e54739af328f01fbacf550da8e5e
Signed-off-by: Wu Jingchen <oven.wu@rock-chips.com>
2019-03-04 10:34:55 +08:00
Hu Kejun
3ce97cd258 media: rockchip: isp1: change version to v0.1.1
Change-Id: I3b13c01a69ea07e15dcf4b2ef1d04d2f46fd1ea2
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-03-04 08:29:58 +08:00
Hu Kejun
17b4a53b9e media: rockchip: isp1: change readx_poll_timeout to readx_poll_timeout_atomic
rkisp1_isp_stop() is called in rkisp1_isp_isr() now,
so change readx_poll_timeout in rkisp1_isp_stop() to readx_poll_timeout_atomic

Change-Id: If4cb8628e38d2c774f30d7200b0804f22d4ccc4c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-03-04 08:25:55 +08:00
Hu Kejun
506c7289af media: rockchip: isp1: use tasklet to get 3A states
Change-Id: I48b86cf19dd203bad32e7412c722056a6c917059
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-03-04 08:24:54 +08:00
Cai YiWei
3351f423d9 media: rockchip: isp1: raw patch with default sensor fmt&size
Change-Id: I057ee38a9369e8e3f26e5899113f9f88585b1e7a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-03-01 19:47:09 +08:00
Cai YiWei
8f0bbf8ba8 media: rockchip: isp1: check for capture S_FMT
Change-Id: I10e75e18cd9f42ac02b4fd0f049851cdf96e8ccf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-03-01 19:47:09 +08:00
Cai YiWei
b3e05022d0 media: rockchip: isp1: stop mipi with shutdown lane
isp_mipi_ctrl[8:11] control synopsys dphy's SHUTDOWNZ
and RSTZ. stop mipi and dphy together.

Change-Id: Ief50ab81f5f960e414a880e43b772ee47752742b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-03-01 19:47:09 +08:00
Finley Xiao
2b56acf4ca arm64: dts: rockchip: rk3399pro-npu: Add pvtm table for npu
Change-Id: If02d1c82fe9126ba9ff3e24f5fb2cfd35e9c7249
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-01 15:59:20 +08:00
Finley Xiao
d3a174d011 arm64: rk3399pro_npu_defconfig: Enable CONFIG_ROCKCHIP_PVTM
Change-Id: I7be830c32c023a0cc838ce2d30748cfeebb2f899
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-01 15:59:20 +08:00
Finley Xiao
0ad8ee931a arm64: dts: rockchip: rk3399pro-npu: Add pvtm node
Change-Id: Ic3044fa2491a38ae8fcb6059b3796186eb15dfe5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-01 15:59:20 +08:00
Shixiang Zheng
2d7faa6e11 video/rockchip: rga2: extend timeount err message
Change-Id: Ibf8698fa835ca28850d07b1cd66a4d1e6e0df3be
Signed-off-by: Shixiang Zheng <shixiang.zheng@rock-chips.com>
2019-03-01 15:57:35 +08:00
Tao Huang
81a128f835 soc: rockchip: cpu: rename menu prompt
From "CPU selection" to "Rockchip CPU selection".

Change-Id: I5d9368ca6eb9ba60cd4c33fdd703775a328e9da0
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-01 09:03:35 +08:00
Hu Kejun
e1c5e7d5da media: rockchip: isp1: stop isp when too many errors are reported
when use hdmi-in chip with isp, it needs to pull out/plug in hdmi cable
when stream is on.
many error logs are reported in interrupt function when pull out/plug in
hdmi cable, then the system will be dead.
so we stop isp when too many error logs are reported.

Change-Id: Ic19eddfc952954a11a176b91c16ce4c9b6372418
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 14:40:41 +08:00
Hu Kejun
ee9f5da734 media: spi: RK1608: add more config information
Change-Id: Ic68ef2dfdcf72a721dca3c4ad263f429144ed537
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 14:37:33 +08:00
Hu Kejun
97f8624ea2 media: i2c: add dummy sensor for preisp
Change-Id: Ifad0062a8fa01e9e005bda2b8b4e73d09b4de925
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 14:35:46 +08:00
Zhangbin Tong
5a3119b4d5 arm64: dts: rockchip: rk3399-box: Fix RC pinctrl error
The commit e38aa951c8 ("pwm: rockchip: Make pwm pinctrl setting after pwm
enabled") modified the pinctrl-names to "active".

Change-Id: I931707d194d7a5aa0c3e652933e8fae3ada20132
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2019-02-28 10:58:22 +08:00
Lin Huang
7d865d0f31 arm64: dts: rockchip: use imx327 on rk1808 evb board
use imx327 as default sensor on RK1808 EVB board.

Change-Id: I7883d7635be74b71ed0ccd74a0490b986d9a006d
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-02-28 10:23:57 +08:00
Lin Huang
9de8cdef2f arm64: rk1808_linux_defconfig: enable imx327 sensor
rk1808 evb board use imx327 as default sensor, so enable it.

Change-Id: I38c6cc77c1263593774b725abcd915559e37a49e
Signed-off-by: Lin Huang <hl@rock-chips.com>
2019-02-28 10:23:41 +08:00