Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aeb0753 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: remove invalid error logs from msm drm" into msm-4.9

parents f874c22e 5473cd26

drivers/gpu/drm/msm/msm_smmu.c

+3 −3
Original line number Diff line number Diff line
@@ -315,10 +315,10 @@ static struct device *msm_smmu_device_create(struct device *dev, 
	}



	if (!compat) {

		DRM_ERROR("unable to find matching domain for %d\n", domain);

		DRM_DEBUG("unable to find matching domain for %d\n", domain);

		return ERR_PTR(-ENOENT);

	}

	DRM_INFO("found domain %d compat: %s\n", domain, compat);

	DRM_DEBUG("found domain %d compat: %s\n", domain, compat);



	if (domain == MSM_SMMU_DOMAIN_UNSECURE) {

		int rc;
@@ -343,7 +343,7 @@ static struct device *msm_smmu_device_create(struct device *dev, 


	child = of_find_compatible_node(dev->of_node, NULL, compat);

	if (!child) {

		DRM_ERROR("unable to find compatible node for %s\n", compat);

		DRM_DEBUG("unable to find compatible node for %s\n", compat);

		return ERR_PTR(-ENODEV);

	}

drivers/gpu/drm/msm/sde/sde_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -998,8 +998,8 @@ static int _sde_kms_mmu_init(struct sde_kms *sde_kms) 
		mmu = msm_smmu_new(sde_kms->dev->dev, i);

		if (IS_ERR(mmu)) {

			ret = PTR_ERR(mmu);

			SDE_ERROR("failed to init iommu id %d: rc: %d\n", i,

					ret);

			SDE_DEBUG("failed to init iommu id %d: rc:%d\n",

								i, ret);

			continue;

		}