diff options
author | Dave Airlie <airlied@redhat.com> | 2020-09-09 12:27:12 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-09-09 12:27:13 +1000 |
commit | 877d8c074302c20ac0759d1a4f689c14aada420d (patch) | |
tree | c4ac9ed42b665fc88dcc73c957cab62496037ac8 /drivers/gpu/drm/bridge | |
parent | 1f4b2aca794f7aeb918ed5f0d7221d68a81d6b43 (diff) | |
parent | 79416e97dda0118b137302575a70a14259a27d7d (diff) | |
download | linux-877d8c074302c20ac0759d1a4f689c14aada420d.tar.bz2 |
Merge tag 'topic/nouveau-i915-dp-helpers-and-cleanup-2020-08-31-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
UAPI Changes:
None
Cross-subsystem Changes:
* Moves a bunch of miscellaneous DP code from the i915 driver into a set
of shared DRM DP helpers
Core Changes:
* New DRM DP helpers (see above)
Driver Changes:
* Implements usage of the aforementioned DP helpers in the nouveau
driver, along with some other various HPD related cleanup for nouveau
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/11e59ebdea7ee4f46803a21fe9b21443d2b9c401.camel@redhat.com
Diffstat (limited to 'drivers/gpu/drm/bridge')
-rw-r--r-- | drivers/gpu/drm/bridge/lontium-lt9611.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c index 1009fc4ed4ed..d734d9402c35 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -960,13 +960,13 @@ static const struct drm_bridge_funcs lt9611_bridge_funcs = { static int lt9611_parse_dt(struct device *dev, struct lt9611 *lt9611) { - lt9611->dsi0_node = of_graph_get_remote_node(dev->of_node, 1, -1); + lt9611->dsi0_node = of_graph_get_remote_node(dev->of_node, 0, -1); if (!lt9611->dsi0_node) { dev_err(lt9611->dev, "failed to get remote node for primary dsi\n"); return -ENODEV; } - lt9611->dsi1_node = of_graph_get_remote_node(dev->of_node, 2, -1); + lt9611->dsi1_node = of_graph_get_remote_node(dev->of_node, 1, -1); lt9611->ac_mode = of_property_read_bool(dev->of_node, "lt,ac-mode"); |