shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: dw_hdmi: Don't enable split mode if another HDMI cannot be obtained

Browse Source 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I19137932989be82d3de3f4afc7d41c57a0067f79
This commit is contained in:
Algea Cao
2022-03-29 20:02:41 +08:00
committed by Tao Huang
parent 2bde53fc60
commit 74a6df9f7a
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
View File

@@ -181,7 +181,6 @@ struct rockchip_hdmi {
unsigned long enc_out_encoding;
int color_changed;
int hpd_irq;
int hdmi_num;
int vp_id;
struct drm_property *color_depth_property;
@@ -2912,6 +2911,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
struct drm_encoder *encoder;
struct rockchip_hdmi *hdmi;
struct dw_hdmi_plat_data *plat_data;
struct rockchip_hdmi *secondary;
int ret;
u32 val;
@@ -2956,13 +2956,9 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
plat_data->property_ops = &dw_hdmi_rockchip_property_ops;
secondary = rockchip_hdmi_find_by_id(dev->driver, !hdmi->id);
/* If don't enable hdmi0 and hdmi1, we don't enable split mode */
if (hdmi->chip_data->split_mode && (hdmi->hdmi_num == 2)) {
struct rockchip_hdmi *secondary =
rockchip_hdmi_find_by_id(dev->driver, !hdmi->id);
if (!secondary)
return -EPROBE_DEFER;
if (hdmi->chip_data->split_mode && secondary) {
/*
* hdmi can only attach bridge and init encoder/connector in the
@@ -3161,10 +3157,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
rockchip_drm_register_sub_dev(&hdmi->sub_dev);
}
if (plat_data->split_mode) {
struct rockchip_hdmi *secondary =
rockchip_hdmi_find_by_id(dev->driver, !hdmi->id);
if (plat_data->split_mode && secondary) {
if (device_property_read_bool(dev, "split-mode")) {
plat_data->right = secondary->hdmi_qp;
secondary->plat_data->left = hdmi->hdmi_qp;
@@ -3252,8 +3245,7 @@ static int dw_hdmi_rockchip_probe(struct platform_device *pdev)
id = of_alias_get_id(pdev->dev.of_node, "hdmi");
if (id < 0)
id = 0;
else
hdmi->hdmi_num++;
hdmi->id = id;
hdmi->dev = &pdev->dev;