diff options
author | Dave Airlie <airlied@redhat.com> | 2017-08-15 16:16:58 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-08-15 16:16:58 +1000 |
commit | 0c697fafc66830ca7d5dc19123a1d0641deaa1f6 (patch) | |
tree | c56336719ca8de16f78ada78e606dffa471e47d5 /drivers/gpu/drm/exynos/exynos_drm_dsi.c | |
parent | 09ef2378dc42339f3871584dc26d27da220277cb (diff) | |
parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
download | op-kernel-dev-0c697fafc66830ca7d5dc19123a1d0641deaa1f6.zip op-kernel-dev-0c697fafc66830ca7d5dc19123a1d0641deaa1f6.tar.gz |
Backmerge tag 'v4.13-rc5' into drm-next
Linux 4.13-rc5
There's a really nasty nouveau collision, hopefully someone can take a look
once I pushed this out.
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_dsi.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_dsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 4ea7cc7..c399dc9 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1649,8 +1649,6 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi) return ret; dsi->bridge_node = of_graph_get_remote_node(node, DSI_PORT_IN, 0); - if (!dsi->bridge_node) - return -EINVAL; return 0; } @@ -1685,9 +1683,11 @@ static int exynos_dsi_bind(struct device *dev, struct device *master, return ret; } - bridge = of_drm_find_bridge(dsi->bridge_node); - if (bridge) - drm_bridge_attach(encoder, bridge, NULL); + if (dsi->bridge_node) { + bridge = of_drm_find_bridge(dsi->bridge_node); + if (bridge) + drm_bridge_attach(encoder, bridge, NULL); + } return mipi_dsi_host_register(&dsi->dsi_host); } |