Merge made by the 'ours' strategy.
* commit '3710e830ff41bf4f9cae6752427d1c82768ba36c':
drm/bridge: dw-hdmi-qp: Support hdmi force output
dt-bindings: display: rockchip: dw_hdmi-rockchip: Add force output property
drm/bridge: synopsys: Support hdmi force output
Change-Id: I319d5d72b2e99fa6a94448c1776f020a7494404e
Support hdmi output specific resolution and color format
regardless of whether hdmi is connected.
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I3f18aeb04427846e06b6a4397a4c6df77bbbcab2
Support hdmi output specific resolution and color format
regardless of whether hdmi is connected.
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I228a74d128aa818166f589798897729473d97610
* commit '334c7192e6a968d1d6272fec5c956ae35a02a3db':
drm/rockchip: drv: display logo when specify force output mode
arm64: dts: rockchip: rk3588-vehicle-maxim-cameras-s66.dtsi: camera module and lens name using default
arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3).dtsi: camera module and lens name using default
arm64: dts: rockchip: rk3588-vehicle-evb: move port dts to bridge node for evb20
Change-Id: I13e8ae92a8f8f9143e2ac5c0cc86b07770354a8d
This patch adds support for register debugfs nodes to allow access to
the registers without modifying the regmap subsystem configuration.
for example:
read rk628 csi registers:
cat /d/rk628/3-0050/registers/csi
write rk628 csi register:
echo addr val > /d/rk628/3-0050/registers/csi
Change-Id: I1bb4b4acff939718eca43fc24c25cf673726cb4c
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
1.enable the rk628 misc driver use on rk3568-evb-rk628
2.disable the rk628 drm driver
Change-Id: I0fbeb1e56915cf25a0db460c76378a5ccf628518
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
1. change the "bt1120_dual_edge" property from macro definition to
parsing in dts
2. "bt1120_dual_edge" and "vccio_rgb" are unique to rk628 rgb, so put
them in the rk628_rgb structure.
3. dts property related to rk628 rgb are parsed in rk628_rgb_parse
function, including those related to rgb in/out and bt1120 in/out.
Type: Fix
Redmine ID: N/A
Associated modifications: N/A
Test: N/A
Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: I1bd7edb9dd28a13cd298142e067e851ef98f83c5
rk628->fb_nb.notifier_call helper will be called multi times in
Multi-display suspend/resume scenario, process fb_event with
FB_BLANK_UNBLANK/FB_BLANK_POWERDOWN only once.
Type: Fix
Redmine ID: #462145
Associated modifications: gerrit links
Test: pass
Change-Id: Id323a392b28892c8440c813571a7808bb6e860ed
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
In previous versions, the bus-format of lvds could be set with prop
"vesa_24", "jeida_24", etc.
In order to maintain consistency with the panel node, this patch adds
support to for set bus-format via the `MEDIA_FORMAT` number macro.
rk628-lvds {
/* Equivalent to
bus-format = "vesa_24";
*/
bus-format = <MEDIA_BUS_FMT_RGB888_1X7X4_SPWG>;
};
Change-Id: I3a8e51c58cfb52ff6b03917d9b33e96fa419bea1
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
This can avoid display splash screen before gvi locked.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Id32d637cd4af8c33f9629abd7c788db6b7e13df9
This patch adds support for register debugfs nodes to allow access to
the registers without modifying the regmap subsystem configuration.
An example output is as follows:
$ ls /d/rk628/2-0050/registers
adapter combtxphy csi dsi1 gpio0 gpio2 grf hdmi
combrxphy cru dsi0 efuse gpio1 gpio3 gvi hdmirx
dump register:
$ cat cru
write to register:
$ echo addr val > cru
Additionally, incorrect GVI regmap_range was fixed.
Because `GVI_COLOR_BAR_VTIMING1` is already defined as `GVI_BASE + 0x7C`
Change-Id: I3f19d02b5119958fe2dafd04dff5efcc4d28d6d0
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
Try to disable and enable GVI and TX phy when GVI lock failed.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I190ed60884850946091185c89e54a7bb551eb03d
