lkml.org 
[lkml]   [2022]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 20/22] gpu: host1x: Avoid trying to use GART on Tegra20
    Date
    From: Robin Murphy <robin.murphy@arm.com>

    [ Upstream commit c2418f911a31a266af4fbaca998dc73d3676475a ]

    Since commit c7e3ca515e78 ("iommu/tegra: gart: Do not register with
    bus") quite some time ago, the GART driver has effectively disabled
    itself to avoid issues with the GPU driver expecting it to work in ways
    that it doesn't. As of commit 57365a04c921 ("iommu: Move bus setup to
    IOMMU device registration") that bodge no longer works, but really the
    GPU driver should be responsible for its own behaviour anyway. Make the
    workaround explicit.

    Reported-by: Jon Hunter <jonathanh@nvidia.com>
    Suggested-by: Dmitry Osipenko <digetx@gmail.com>
    Signed-off-by: Robin Murphy <robin.murphy@arm.com>
    Tested-by: Jon Hunter <jonathanh@nvidia.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/tegra/drm.c | 4 ++++
    drivers/gpu/host1x/dev.c | 4 ++++
    2 files changed, 8 insertions(+)

    diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
    index 2c6ebc328b24..318692ad9680 100644
    --- a/drivers/gpu/drm/tegra/drm.c
    +++ b/drivers/gpu/drm/tegra/drm.c
    @@ -1042,6 +1042,10 @@ static bool host1x_drm_wants_iommu(struct host1x_device *dev)
    struct host1x *host1x = dev_get_drvdata(dev->dev.parent);
    struct iommu_domain *domain;

    + /* Our IOMMU usage policy doesn't currently play well with GART */
    + if (of_machine_is_compatible("nvidia,tegra20"))
    + return false;
    +
    /*
    * If the Tegra DRM clients are backed by an IOMMU, push buffers are
    * likely to be allocated beyond the 32-bit boundary if sufficient
    diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
    index 8659558b518d..9f674a8d5009 100644
    --- a/drivers/gpu/host1x/dev.c
    +++ b/drivers/gpu/host1x/dev.c
    @@ -198,6 +198,10 @@ static void host1x_setup_sid_table(struct host1x *host)

    static bool host1x_wants_iommu(struct host1x *host1x)
    {
    + /* Our IOMMU usage policy doesn't currently play well with GART */
    + if (of_machine_is_compatible("nvidia,tegra20"))
    + return false;
    +
    /*
    * If we support addressing a maximum of 32 bits of physical memory
    * and if the host1x firewall is enabled, there's no need to enable
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-11-23 13:55    [W:4.113 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site