drm/msm: Fix display fault handling
PATCH 1/1 drm/msm: Fix display fault handling
From: Rob Clark <[email protected]>
It turns out that when the display is enabled by the bootloader, we can get some transient iommu faults from the display. Which doesn't go over too well when we install a fault handler that is gpu specific. To avoid this, defer installing the fault handler until we get around to setting up per-process pgtables (which is adreno_smmu specific). The arm-smmu fallback error reporting is sufficient for reporting display related faults (and in fact was all we had prior to f8f934c180f629bb927a04fd90d)
--- drivers/gpu/drm/msm/msm_iommu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_iommu.c +10 -1
@@ -142,6 +142,9 @@ static const struct iommu_flush_ops null_tlb_ops = { .tlb_add_page = msm_iommu_tlb_add_page, }; +static int msm_fault_handler (struct iommu_domain *domain,struct device *dev, +unsigned long iova,int flags,void *arg); +struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent) {struct adreno_smmu_priv *adreno_smmu =dev_get_drvdata (parent->dev);
@@ -157,6 +160,13 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent)if (!ttbr1_cfg)return ERR_PTR (-ENODEV ); +/* +* Defer setting the fault handler until we have a valid adreno_smmu +* to avoid accidentially installing a GPU specific fault handler for +* the display's iommu +*/ +iommu_set_fault_handler (iommu->domain, msm_fault_handler, iommu); + pagetable =kzalloc (sizeof (*pagetable),GFP_KERNEL );if (!pagetable)return ERR_PTR (-ENOMEM );
@@ -300,7 +310,6 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain) iommu->domain = domain;msm_mmu_init (&iommu->base, dev, &funcs,MSM_MMU_IOMMU ); -iommu_set_fault_handler (domain, msm_fault_handler, iommu);atomic_set (&iommu->pagetables,0 );
Signature · 1 line
2.31.1
Quoted 67 lines · Rob Clark
From: Rob Clark <[email protected]>
It turns out that when the display is enabled by the bootloader, we can
get some transient iommu faults from the display. Which doesn't go over
too well when we install a fault handler that is gpu specific. To avoid
this, defer installing the fault handler until we get around to setting
up per-process pgtables (which isadreno_smmuspecific). The arm-smmu fallback error reporting is sufficient for reporting display related faults (and in fact was all we had prior tof8f934c180f629bb927a04fd90d)Reported-by Dmitry Baryshkov <[email protected]>Reported-by Yassine Oudjana <[email protected]>Fixes 2a574cc05d38 ("drm/msm: Improve the a6xx page fault handler")Signed-off-by Rob Clark <[email protected]>Tested-by John Stultz <[email protected]>--- drivers/gpu/drm/msm/msm_iommu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_iommu.c +3
-0@@ -142,6 +142,9 @@ static const struct iommu_flush_ops null_tlb_ops = { .tlb_add_page = msm_iommu_tlb_add_page, }; +static int msm_fault_handler (struct iommu_domain *domain,struct device *dev, +unsigned long iova,int flags,void *arg); +struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent){
drivers/gpu/drm/msm/msm_iommu.c +3
-0struct adreno_smmu_priv *adreno_smmu =dev_get_drvdata (parent->dev);@@ -157,6 +160,13 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent)if (!ttbr1_cfg)return ERR_PTR (-ENODEV ); +/* +* Defer setting the fault handler until we have a valid adreno_smmu +* to avoid accidentially installing a GPU specific fault handler for
drivers/gpu/drm/msm/msm_iommu.c +4
-2+* the display's iommu +*/ +iommu_set_fault_handler (iommu->domain, msm_fault_handler, iommu); + pagetable =kzalloc (sizeof (*pagetable),GFP_KERNEL );if (!pagetable)return ERR_PTR (-ENOMEM );@@ -300,7 +310,6 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain) iommu->domain = domain;msm_mmu_init (&iommu->base, dev, &funcs,MSM_MMU_IOMMU ); -iommu_set_fault_handler (domain, msm_fault_handler, iommu);atomic_set (&iommu->pagetables,0 ); --
Quoted 2 lines
2.31.1
Quoted 11 lines · Rob Clark
From: Rob Clark <[email protected]>
It turns out that when the display is enabled by the bootloader, we can get some transient iommu faults from the display. Which doesn't go over too well when we install a fault handler that is gpu specific. To avoid this, defer installing the fault handler until we get around to setting up per-process pgtables (which is
adreno_smmuspecific). The arm-smmu fallback error reporting is sufficient for reporting display related faults (and in fact was all we had prior tof8f934c180f629bb927a04fd90d)
Quoted 6 lines
Reported-by Dmitry Baryshkov <[email protected]>Reported-by Yassine Oudjana <[email protected]>Fixes 2a574cc05d38 ("drm/msm: Improve the a6xx page fault handler")Signed-off-by Rob Clark <[email protected]>Tested-by John Stultz <[email protected]>---
Hey folks!
Just wanted to follow up on this, as it's still missing from
5.14-rc3 and is critical for resolving a boot regression on db845c. Is there anything keeping this from heading upstream?
thanks
-john
Quoted 10 lines · Rob Clark
From: Rob Clark <[email protected]>
It turns out that when the display is enabled by the bootloader, we can get some transient iommu faults from the display. Which doesn't go over too well when we install a fault handler that is gpu specific. To avoid this, defer installing the fault handler until we get around to setting up per-process pgtables (which is
adreno_smmuspecific). The arm-smmu fallback error reporting is sufficient for reporting display related faults (and in fact was all we had prior tof8f934c180f629bb927a04fd90d)
Quoted 5 lines
Reported-by Dmitry Baryshkov <[email protected]>Reported-by Yassine Oudjana <[email protected]>Fixes 2a574cc05d38 ("drm/msm: Improve the a6xx page fault handler")Signed-off-by Rob Clark <[email protected]>Tested-by John Stultz <[email protected]>
Regards,
Bjorn
Quoted 43 lines
--- drivers/gpu/drm/msm/msm_iommu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/msm_iommu.c +10
-1@@ -142,6 +142,9 @@ static const struct iommu_flush_ops null_tlb_ops = { .tlb_add_page = msm_iommu_tlb_add_page, }; +static int msm_fault_handler (struct iommu_domain *domain,struct device *dev, +unsigned long iova,int flags,void *arg); +struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent) {struct adreno_smmu_priv *adreno_smmu =dev_get_drvdata (parent->dev);@@ -157,6 +160,13 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent)if (!ttbr1_cfg)return ERR_PTR (-ENODEV ); +/* +* Defer setting the fault handler until we have a valid adreno_smmu +* to avoid accidentially installing a GPU specific fault handler for +* the display's iommu +*/ +iommu_set_fault_handler (iommu->domain, msm_fault_handler, iommu); + pagetable =kzalloc (sizeof (*pagetable),GFP_KERNEL );if (!pagetable)return ERR_PTR (-ENOMEM );@@ -300,7 +310,6 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain) iommu->domain = domain;msm_mmu_init (&iommu->base, dev, &funcs,MSM_MMU_IOMMU ); -iommu_set_fault_handler (domain, msm_fault_handler, iommu);atomic_set (&iommu->pagetables,0 );Signature · 1 line
2.31.1