From: Rob Clark <robdcl...@chromium.org>

Otherwise it is not always obvious if a dt or iommu change is causing us
to fall back to global pgtable.

Signed-off-by: Rob Clark <robdcl...@chromium.org>
---
 drivers/gpu/drm/msm/msm_iommu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 418e1e06cdde..1b7792d35860 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -224,24 +224,25 @@ static int msm_fault_handler(struct iommu_domain *domain, 
struct device *dev,
 
 struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent)
 {
        struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(parent->dev);
        struct msm_iommu *iommu = to_msm_iommu(parent);
        struct msm_iommu_pagetable *pagetable;
        const struct io_pgtable_cfg *ttbr1_cfg = NULL;
        struct io_pgtable_cfg ttbr0_cfg;
        int ret;
 
+
        /* Get the pagetable configuration from the domain */
        if (adreno_smmu->cookie)
                ttbr1_cfg = adreno_smmu->get_ttbr1_cfg(adreno_smmu->cookie);
-       if (!ttbr1_cfg)
+       if (WARN_ON_ONCE(!ttbr1_cfg))
                return ERR_PTR(-ENODEV);
 
        pagetable = kzalloc(sizeof(*pagetable), GFP_KERNEL);
        if (!pagetable)
                return ERR_PTR(-ENOMEM);
 
        msm_mmu_init(&pagetable->base, parent->dev, &pagetable_funcs,
                MSM_MMU_IOMMU_PAGETABLE);
 
        /* Clone the TTBR1 cfg as starting point for TTBR0 cfg: */
-- 
2.39.2

Reply via email to