| Message ID | 20190626180015.45242-1-jeffrey.l.hugo@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | drm: msm: Fix add_gpu_components | expand |
On Wed, Jun 26, 2019 at 11:00 AM Jeffrey Hugo <jeffrey.l.hugo@gmail.com> wrote: > > add_gpu_components() adds found GPU nodes from the DT to the match list, > regardless of the status of the nodes. This is a problem, because if the > nodes are disabled, they should not be on the match list because they will > not be matched. This prevents display from initing if a GPU node is > defined, but it's status is disabled. > > Fix this by checking the node's status before adding it to the match list. hmm, I guess a case I had certainly never tested ;-) I wonder if it really makes sense for gpu to ever be disabled (since it isn't depending on external non-SoC-specific wiring up of things.. but I guess that might still be useful for bring-up.. either way, Reviewed-by: Rob Clark <robdclark@gmail.com> Sean, want to pick this up in drm-misc-fixes? BR, -R > > Fixes: dc3ea265b856 ("drm/msm: Drop the gpu binding") > Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> > --- > drivers/gpu/drm/msm/msm_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index ab64ab470de7..4aeb84f1d874 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -1279,7 +1279,8 @@ static int add_gpu_components(struct device *dev, > if (!np) > return 0; > > - drm_of_component_match_add(dev, matchptr, compare_of, np); > + if (of_device_is_available(np)) > + drm_of_component_match_add(dev, matchptr, compare_of, np); > > of_node_put(np); > > -- > 2.17.1 >
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index ab64ab470de7..4aeb84f1d874 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1279,7 +1279,8 @@ static int add_gpu_components(struct device *dev, if (!np) return 0; - drm_of_component_match_add(dev, matchptr, compare_of, np); + if (of_device_is_available(np)) + drm_of_component_match_add(dev, matchptr, compare_of, np); of_node_put(np);
add_gpu_components() adds found GPU nodes from the DT to the match list, regardless of the status of the nodes. This is a problem, because if the nodes are disabled, they should not be on the match list because they will not be matched. This prevents display from initing if a GPU node is defined, but it's status is disabled. Fix this by checking the node's status before adding it to the match list. Fixes: dc3ea265b856 ("drm/msm: Drop the gpu binding") Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> --- drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)