All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephane Viau <sviau@codeaurora.org>
To: dri-devel@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 03/10] drm/msm: Fix IOMMU clean up path in case msm_iommu_new() fails
Date: Tue, 15 Sep 2015 08:41:46 -0400	[thread overview]
Message-ID: <1442320913-3248-4-git-send-email-sviau@codeaurora.org> (raw)
In-Reply-To: <1442320913-3248-1-git-send-email-sviau@codeaurora.org>

msm_iommu_new() can fail and this change makes sure that we
detect the failure and free the allocated domain before going
any further.

Signed-off-by: Stephane Viau <sviau@codeaurora.org>
---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 1 +
 drivers/gpu/drm/msm/msm_gpu.c           | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 14ac20a..e11028c6 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -590,6 +590,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
 		if (IS_ERR(mmu)) {
 			ret = PTR_ERR(mmu);
 			dev_err(dev->dev, "failed to init iommu: %d\n", ret);
+			iommu_domain_free(config->platform.iommu);
 			goto fail;
 		}
 
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 5d31b5a..aed9f37 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -651,6 +651,14 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
 	if (iommu) {
 		dev_info(drm->dev, "%s: using IOMMU\n", name);
 		gpu->mmu = msm_iommu_new(&pdev->dev, iommu);
+		if (IS_ERR(gpu->mmu)) {
+			ret = PTR_ERR(gpu->mmu);
+			dev_err(drm->dev, "failed to init iommu: %d\n", ret);
+			gpu->mmu = NULL;
+			iommu_domain_free(iommu);
+			goto fail;
+		}
+
 	} else {
 		dev_info(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", name);
 	}
-- 
Qualcomm Innovation Center, Inc.

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Stephane Viau <sviau@codeaurora.org>
To: dri-devel@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
	robdclark@gmail.com, Stephane Viau <sviau@codeaurora.org>
Subject: [PATCH 03/10] drm/msm: Fix IOMMU clean up path in case msm_iommu_new() fails
Date: Tue, 15 Sep 2015 08:41:46 -0400	[thread overview]
Message-ID: <1442320913-3248-4-git-send-email-sviau@codeaurora.org> (raw)
In-Reply-To: <1442320913-3248-1-git-send-email-sviau@codeaurora.org>

msm_iommu_new() can fail and this change makes sure that we
detect the failure and free the allocated domain before going
any further.

Signed-off-by: Stephane Viau <sviau@codeaurora.org>
---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 1 +
 drivers/gpu/drm/msm/msm_gpu.c           | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 14ac20a..e11028c6 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -590,6 +590,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
 		if (IS_ERR(mmu)) {
 			ret = PTR_ERR(mmu);
 			dev_err(dev->dev, "failed to init iommu: %d\n", ret);
+			iommu_domain_free(config->platform.iommu);
 			goto fail;
 		}
 
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 5d31b5a..aed9f37 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -651,6 +651,14 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
 	if (iommu) {
 		dev_info(drm->dev, "%s: using IOMMU\n", name);
 		gpu->mmu = msm_iommu_new(&pdev->dev, iommu);
+		if (IS_ERR(gpu->mmu)) {
+			ret = PTR_ERR(gpu->mmu);
+			dev_err(drm->dev, "failed to init iommu: %d\n", ret);
+			gpu->mmu = NULL;
+			iommu_domain_free(iommu);
+			goto fail;
+		}
+
 	} else {
 		dev_info(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", name);
 	}
-- 
Qualcomm Innovation Center, Inc.

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project


  parent reply	other threads:[~2015-09-15 12:41 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-15 12:41 [PATCH 00/10] drm/msm: Add support for MSM8996 Stephane Viau
2015-09-15 12:41 ` Stephane Viau
2015-09-15 12:41 ` [PATCH 01/10] drm/msm/mdp5: remove the cfg pointer from SMP struct Stephane Viau
2015-09-15 12:41   ` Stephane Viau
2015-09-15 12:41 ` [PATCH 02/10] drm/msm/mdp5: Disable hardware translation table walks (MSM8996) Stephane Viau
2015-09-15 12:41   ` Stephane Viau
2015-09-15 12:41 ` Stephane Viau [this message]
2015-09-15 12:41   ` [PATCH 03/10] drm/msm: Fix IOMMU clean up path in case msm_iommu_new() fails Stephane Viau
2015-09-15 12:41 ` [PATCH 04/10] drm/msm/mdp5: Avoid printing error messages for optional clocks Stephane Viau
2015-09-15 12:41   ` Stephane Viau
2015-09-15 12:41 ` [PATCH 05/10] drm/msm/mdp5: Vote for SMMU power when performing translations Stephane Viau
2015-09-15 12:41   ` Stephane Viau
2015-09-15 12:41 ` [PATCH 06/10] drm/msm/hdmi: Add basic HDMI support for msm8996 Stephane Viau
2015-09-15 12:41   ` Stephane Viau
2015-09-15 12:41 ` [PATCH 07/10] drm/msm/mdp: Update generated headers (Pixel Extension) Stephane Viau
2015-09-15 12:41   ` Stephane Viau
2015-09-15 12:45   ` [PATCH] rnndb: Add Pixel Extension registers Stephane Viau
2015-09-15 12:45     ` Stephane Viau
2015-09-15 12:41 ` [PATCH 08/10] drm/msm/mdp5: Use the newly introduced enum mdp_component_type Stephane Viau
2015-09-15 12:41 ` [PATCH 09/10] drm/msm/mdp: Add Software Pixel Extension support Stephane Viau
2015-09-15 12:41   ` Stephane Viau
2015-09-15 12:41 ` [PATCH 10/10] drm/msm/mdp5: Basic support for MDP5 v1.7 (MSM8996) Stephane Viau
2015-09-15 12:41   ` Stephane Viau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442320913-3248-4-git-send-email-sviau@codeaurora.org \
    --to=sviau@codeaurora.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.