lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 216/633] drm/msm/adreno: fix probe without iommu
    Date
    From: Luca Weiss <luca@z3ntu.xyz>

    [ Upstream commit 0a48db562c6264da2ae8013491efd6e8dc780520 ]

    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>
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.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 a74ccc5b8220d..5b5809c0e44b3 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.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:14    [W:3.332 / U:0.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site