Commit a8817489 authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: Silence expected errors on IOMMU attach 



Subdevices may not be hooked up to an IOMMU via device tree. Detect such
situations and avoid confusing users by not emitting an error message.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 82d73874

drivers/gpu/drm/tegra/dc.c

+1 −1
Original line number Diff line number Diff line
@@ -2017,7 +2017,7 @@ static int tegra_dc_init(struct host1x_client *client) 
		dev_warn(dc->dev, "failed to allocate syncpoint\n");



	err = host1x_client_iommu_attach(client);

	if (err < 0) {

	if (err < 0 && err != -ENODEV) {

		dev_err(client->dev, "failed to attach to domain: %d\n", err);

		return err;

	}

drivers/gpu/drm/tegra/drm.c

+1 −3
Original line number Diff line number Diff line
@@ -920,10 +920,8 @@ int host1x_client_iommu_attach(struct host1x_client *client) 


	if (tegra->domain) {

		group = iommu_group_get(client->dev);

		if (!group) {

			dev_err(client->dev, "failed to get IOMMU group\n");

		if (!group)

			return -ENODEV;

		}



		if (domain != tegra->domain) {

			err = iommu_attach_group(tegra->domain, group);

drivers/gpu/drm/tegra/vic.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int vic_init(struct host1x_client *client) 
	int err;



	err = host1x_client_iommu_attach(client);

	if (err < 0) {

	if (err < 0 && err != -ENODEV) {

		dev_err(vic->dev, "failed to attach to domain: %d\n", err);

		return err;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE