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: Paul Kocialkowski <contact@paulk.fr>
Fixes: 404bfb78da
("gpu: host1x: Add IOMMU support")
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170710193305.5987-1-contact@paulk.fr
This commit is contained in:
Родитель
b9670ca20a
Коммит
fea2099597
|
@ -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) {
|
||||
iommu_domain_free(host->domain);
|
||||
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;
|
||||
}
|
||||
|
||||
skip_iommu:
|
||||
err = host1x_channel_list_init(&host->channel_list,
|
||||
host->info->nb_channels);
|
||||
if (err) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче