Commit fea20995 authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Thierry Reding

gpu: host1x: Free the IOMMU domain when there is no device to attach

When there is no device to attach to the IOMMU domain, as may be the
case when the device-tree does not contain the proper iommu node, it is
best to keep going without IOMMU support rather than failing.
This allows the driver to probe and function instead of taking down
all of the tegra drm driver, leading to missing display support.
Signed-off-by: default avatarPaul Kocialkowski <>
Fixes: 404bfb78 ("gpu: host1x: Add IOMMU support")
Reviewed-by: default avatarMikko Perttunen <>
Tested-by: default avatarMarcel Ziswiler <>
Signed-off-by: default avatarThierry Reding <>
parent b9670ca2
......@@ -186,8 +186,13 @@ static int host1x_probe(struct platform_device *pdev)
return -ENOMEM;
err = iommu_attach_device(host->domain, &pdev->dev);
if (err)
if (err == -ENODEV) {
host->domain = NULL;
goto skip_iommu;
} else if (err) {
goto fail_free_domain;
geometry = &host->domain->geometry;
......@@ -198,6 +203,7 @@ static int host1x_probe(struct platform_device *pdev)
host->iova_end = geometry->aperture_end;
err = host1x_channel_list_init(&host->channel_list,
if (err) {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment