Skip to content

Commit

Permalink
drm/msm: Only add available components
Browse files Browse the repository at this point in the history
When trying to get the display up on my sdm845 board I noticed that
the display wouldn't probe if I had the dsi1 node marked as "disabled"
even though my board doesn't use dsi1.  It looks like the msm code
adds all nodes to its list of components even if they are disabled.  I
believe this doesn't work because all registered components need to
come up before we finish probing.  Let's do like other DRM code and
only add available components.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Rob Clark <robdclark@gmail.com>
  • Loading branch information
Douglas Anderson authored and Rob Clark committed Dec 11, 2018
1 parent e400b9e commit d1d9d0e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/msm/msm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1256,8 +1256,10 @@ static int add_components_mdp(struct device *mdp_dev,
if (!intf)
continue;

drm_of_component_match_add(master_dev, matchptr, compare_of,
intf);
if (of_device_is_available(intf))
drm_of_component_match_add(master_dev, matchptr,
compare_of, intf);

of_node_put(intf);
}

Expand Down

0 comments on commit d1d9d0e

Please sign in to comment.