* [PATCH] drm/msm/adreno: fix probe without iommu
@ 2020-09-11 16:08 Luca Weiss
2020-09-11 21:45 ` Jordan Crouse
2020-09-13 3:14 ` Bjorn Andersson
0 siblings, 2 replies; 3+ messages in thread
From: Luca Weiss @ 2020-09-11 16:08 UTC (permalink / raw)
To: freedreno
Cc: ~postmarketos/upstreaming, Luca Weiss, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Jordan Crouse, Bjorn Andersson,
Jonathan Marek, Brian Masney, John Stultz, linux-arm-msm,
dri-devel, linux-kernel
The function iommu_domain_alloc returns NULL on platforms without IOMMU
such as msm8974. This resulted in PTR_ERR(-ENODEV) being assigned to
gpu->aspace so the correct code path wasn't taken.
Fixes: ccac7ce373c1 ("drm/msm: Refactor address space initialization")
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 862dd35b27d3..6e8bef1a9ea2 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -189,10 +189,16 @@ struct msm_gem_address_space *
adreno_iommu_create_address_space(struct msm_gpu *gpu,
struct platform_device *pdev)
{
- struct iommu_domain *iommu = iommu_domain_alloc(&platform_bus_type);
- struct msm_mmu *mmu = msm_iommu_new(&pdev->dev, iommu);
+ struct iommu_domain *iommu;
+ struct msm_mmu *mmu;
struct msm_gem_address_space *aspace;
+ iommu = iommu_domain_alloc(&platform_bus_type);
+ if (!iommu)
+ return NULL;
+
+ mmu = msm_iommu_new(&pdev->dev, iommu);
+
aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M,
0xffffffff - SZ_16M);
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/msm/adreno: fix probe without iommu
2020-09-11 16:08 [PATCH] drm/msm/adreno: fix probe without iommu Luca Weiss
@ 2020-09-11 21:45 ` Jordan Crouse
2020-09-13 3:14 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Jordan Crouse @ 2020-09-11 21:45 UTC (permalink / raw)
To: Luca Weiss
Cc: freedreno, ~postmarketos/upstreaming, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Bjorn Andersson, Jonathan Marek,
Brian Masney, John Stultz, linux-arm-msm, dri-devel,
linux-kernel
On Fri, Sep 11, 2020 at 06:08:53PM +0200, Luca Weiss wrote:
> The function iommu_domain_alloc returns NULL on platforms without IOMMU
> such as msm8974. This resulted in PTR_ERR(-ENODEV) being assigned to
> gpu->aspace so the correct code path wasn't taken.
>
> Fixes: ccac7ce373c1 ("drm/msm: Refactor address space initialization")
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
> ---
> drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> index 862dd35b27d3..6e8bef1a9ea2 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> @@ -189,10 +189,16 @@ struct msm_gem_address_space *
> adreno_iommu_create_address_space(struct msm_gpu *gpu,
> struct platform_device *pdev)
> {
> - struct iommu_domain *iommu = iommu_domain_alloc(&platform_bus_type);
> - struct msm_mmu *mmu = msm_iommu_new(&pdev->dev, iommu);
> + struct iommu_domain *iommu;
> + struct msm_mmu *mmu;
> struct msm_gem_address_space *aspace;
>
> + iommu = iommu_domain_alloc(&platform_bus_type);
> + if (!iommu)
> + return NULL;
> +
> + mmu = msm_iommu_new(&pdev->dev, iommu);
> +
> aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M,
> 0xffffffff - SZ_16M);
>
> --
> 2.28.0
>
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/msm/adreno: fix probe without iommu
2020-09-11 16:08 [PATCH] drm/msm/adreno: fix probe without iommu Luca Weiss
2020-09-11 21:45 ` Jordan Crouse
@ 2020-09-13 3:14 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2020-09-13 3:14 UTC (permalink / raw)
To: Luca Weiss
Cc: freedreno, ~postmarketos/upstreaming, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Jordan Crouse, Jonathan Marek,
Brian Masney, John Stultz, linux-arm-msm, dri-devel,
linux-kernel
On Fri 11 Sep 11:08 CDT 2020, Luca Weiss wrote:
> The function iommu_domain_alloc returns NULL on platforms without IOMMU
> such as msm8974. This resulted in PTR_ERR(-ENODEV) being assigned to
> gpu->aspace so the correct code path wasn't taken.
>
> Fixes: ccac7ce373c1 ("drm/msm: Refactor address space initialization")
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> index 862dd35b27d3..6e8bef1a9ea2 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> @@ -189,10 +189,16 @@ struct msm_gem_address_space *
> adreno_iommu_create_address_space(struct msm_gpu *gpu,
> struct platform_device *pdev)
> {
> - struct iommu_domain *iommu = iommu_domain_alloc(&platform_bus_type);
> - struct msm_mmu *mmu = msm_iommu_new(&pdev->dev, iommu);
> + struct iommu_domain *iommu;
> + struct msm_mmu *mmu;
> struct msm_gem_address_space *aspace;
>
> + iommu = iommu_domain_alloc(&platform_bus_type);
> + if (!iommu)
> + return NULL;
> +
> + mmu = msm_iommu_new(&pdev->dev, iommu);
> +
> aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M,
> 0xffffffff - SZ_16M);
>
> --
> 2.28.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-13 3:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-11 16:08 [PATCH] drm/msm/adreno: fix probe without iommu Luca Weiss
2020-09-11 21:45 ` Jordan Crouse
2020-09-13 3:14 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).