From: Sui Jingfeng <sui.jingfeng@linux.dev>
To: Lucas Stach <l.stach@pengutronix.de>,
Russell King <linux+etnaviv@armlinux.org.uk>,
Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
Sui Jingfeng <sui.jingfeng@linux.dev>
Subject: [PATCH 2/2] drm/etnaviv: Remove the etnaviv_iommuv2_ensure_stlb()
Date: Fri, 8 Nov 2024 22:36:58 +0800 [thread overview]
Message-ID: <20241108143658.2229786-2-sui.jingfeng@linux.dev> (raw)
In-Reply-To: <20241108143658.2229786-1-sui.jingfeng@linux.dev>
The etnaviv_iommuv2_ensure_stlb() function have been replaced by the
etnaviv_iommuv2_ensure_stlb_new(), remove it.
Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev>
---
drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c
index fa6eed1ae1be..65b91eabb278 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c
@@ -113,30 +113,6 @@ static void etnaviv_iommuv2_free(struct etnaviv_iommu_context *context)
vfree(v2_context);
}
-static int
-etnaviv_iommuv2_ensure_stlb(struct etnaviv_iommuv2_context *v2_context,
- int stlb)
-{
- if (v2_context->stlb_cpu[stlb])
- return 0;
-
- v2_context->stlb_cpu[stlb] =
- dma_alloc_wc(v2_context->base.global->dev, SZ_4K,
- &v2_context->stlb_dma[stlb],
- GFP_KERNEL);
-
- if (!v2_context->stlb_cpu[stlb])
- return -ENOMEM;
-
- memset32(v2_context->stlb_cpu[stlb], MMUv2_PTE_EXCEPTION,
- SZ_4K / sizeof(u32));
-
- v2_context->mtlb_cpu[stlb] =
- v2_context->stlb_dma[stlb] | MMUv2_PTE_PRESENT;
-
- return 0;
-}
-
static int etnaviv_iommuv2_map(struct etnaviv_iommu_context *context,
unsigned long iova, phys_addr_t paddr,
size_t size, int prot)
--
2.34.1
next prev parent reply other threads:[~2024-11-08 14:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 14:36 [PATCH 1/2] drm/etnaviv: Preallocate STLB according to CPU PAGE_SIZE Sui Jingfeng
2024-11-08 14:36 ` Sui Jingfeng [this message]
2024-12-03 18:04 ` Lucas Stach
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=20241108143658.2229786-2-sui.jingfeng@linux.dev \
--to=sui.jingfeng@linux.dev \
--cc=airlied@gmail.com \
--cc=christian.gmeiner@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=etnaviv@lists.freedesktop.org \
--cc=l.stach@pengutronix.de \
--cc=linux+etnaviv@armlinux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=simona@ffwll.ch \
/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