From: Yassine Oudjana <y.oudjana@protonmail.com>
To: Rob Clark <robdclark@gmail.com>
Cc: dri-devel@lists.freedesktop.org,
Rob Clark <robdclark@chromium.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
John Stultz <john.stultz@linaro.org>, Sean Paul <sean@poorly.run>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Jordan Crouse <jordan@cosmicpenguin.net>,
linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/msm: Fix display fault handling
Date: Fri, 09 Jul 2021 07:28:20 +0000 [thread overview]
Message-ID: <3pFCrTgsGtxAZ1a2xns0dgqCOz61HZr4foJlLOl1l3I@cp4-web-034.plabs.ch> (raw)
In-Reply-To: <20210707180113.840741-1-robdclark@gmail.com>
On Wed, Jul 7 2021 at 21:57:05 +0400, Rob Clark <robdclark@gmail.com>
wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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)
>
> Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Reported-by: Yassine Oudjana <y.oudjana@protonmail.com>
> Fixes: 2a574cc05d38 ("drm/msm: Improve the a6xx page fault handler")
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> Tested-by: John Stultz <john.stultz@linaro.org>
> ---
> drivers/gpu/drm/msm/msm_iommu.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_iommu.c
> b/drivers/gpu/drm/msm/msm_iommu.c
> index eed2a762e9dd..bcaddbba564d 100644
> --- a/drivers/gpu/drm/msm/msm_iommu.c
> +++ b/drivers/gpu/drm/msm/msm_iommu.c
> @@ -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);
>
> --
> 2.31.1
>
Tested-by: Yassine Oudjana <y.oudjana@protonmail.com>
next prev parent reply other threads:[~2021-07-09 7:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 18:01 [PATCH] drm/msm: Fix display fault handling Rob Clark
2021-07-09 7:28 ` Yassine Oudjana [this message]
2021-07-26 19:03 ` John Stultz
2021-07-27 4:21 ` Bjorn Andersson
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=3pFCrTgsGtxAZ1a2xns0dgqCOz61HZr4foJlLOl1l3I@cp4-web-034.plabs.ch \
--to=y.oudjana@protonmail.com \
--cc=airlied@linux.ie \
--cc=bjorn.andersson@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=john.stultz@linaro.org \
--cc=jordan@cosmicpenguin.net \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@chromium.org \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
/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 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).