Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 1af998b2 编写于 作者: L Lucas Stach
浏览文件
操作

drm/etnaviv: switch MMU page tables to writecombine memory 

We are likely to write multiple page entries at once and already ensure
proper write buffer flushing before GPU submit, so this improves CPU
time usage in the submit path without any downsides.
Signed-off-by: NLucas Stach <l.stach@pengutronix.de>
Reviewed-by: NPhilipp Zabel <p.zabel@pengutronix.de>
上级 a98b1e78
隐藏空白更改
内联 并排
Showing with 49 addition and 59 deletion
drivers/gpu/drm/etnaviv/etnaviv_iommu.c
浏览文件 @ 1af998b2
...@@ -47,11 +47,10 @@ static int __etnaviv_iommu_init(struct etnaviv_iommuv1_domain *etnaviv_domain) ...@@ -47,11 +47,10 @@ static int __etnaviv_iommu_init(struct etnaviv_iommuv1_domain *etnaviv_domain)
u32 *p; u32 *p;
int i; int i;
etnaviv_domain->base.bad_page_cpu = dma_alloc_coherent( etnaviv_domain->base.bad_page_cpu =
etnaviv_domain->base.dev, dma_alloc_wc(etnaviv_domain->base.dev, SZ_4K,
SZ_4K, &etnaviv_domain->base.bad_page_dma,
&etnaviv_domain->base.bad_page_dma, GFP_KERNEL);
GFP_KERNEL);
if (!etnaviv_domain->base.bad_page_cpu) if (!etnaviv_domain->base.bad_page_cpu)
return -ENOMEM; return -ENOMEM;
...@@ -59,14 +58,14 @@ static int __etnaviv_iommu_init(struct etnaviv_iommuv1_domain *etnaviv_domain) ...@@ -59,14 +58,14 @@ static int __etnaviv_iommu_init(struct etnaviv_iommuv1_domain *etnaviv_domain)
for (i = 0; i < SZ_4K / 4; i++) for (i = 0; i < SZ_4K / 4; i++)
*p++ = 0xdead55aa; *p++ = 0xdead55aa;
etnaviv_domain->pgtable_cpu = etnaviv_domain->pgtable_cpu = dma_alloc_wc(etnaviv_domain->base.dev,
dma_alloc_coherent(etnaviv_domain->base.dev, PT_SIZE, PT_SIZE,
&etnaviv_domain->pgtable_dma, &etnaviv_domain->pgtable_dma,
GFP_KERNEL); GFP_KERNEL);
if (!etnaviv_domain->pgtable_cpu) { if (!etnaviv_domain->pgtable_cpu) {
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->base.bad_page_cpu, etnaviv_domain->base.bad_page_cpu,
etnaviv_domain->base.bad_page_dma); etnaviv_domain->base.bad_page_dma);
return -ENOMEM; return -ENOMEM;
} }
...@@ -81,13 +80,12 @@ static void etnaviv_iommuv1_domain_free(struct etnaviv_iommu_domain *domain) ...@@ -81,13 +80,12 @@ static void etnaviv_iommuv1_domain_free(struct etnaviv_iommu_domain *domain)
struct etnaviv_iommuv1_domain *etnaviv_domain = struct etnaviv_iommuv1_domain *etnaviv_domain =
to_etnaviv_domain(domain); to_etnaviv_domain(domain);
dma_free_coherent(etnaviv_domain->base.dev, PT_SIZE, dma_free_wc(etnaviv_domain->base.dev, PT_SIZE,
etnaviv_domain->pgtable_cpu, etnaviv_domain->pgtable_cpu, etnaviv_domain->pgtable_dma);
etnaviv_domain->pgtable_dma);
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->base.bad_page_cpu, etnaviv_domain->base.bad_page_cpu,
etnaviv_domain->base.bad_page_dma); etnaviv_domain->base.bad_page_dma);
kfree(etnaviv_domain); kfree(etnaviv_domain);
} }
......
drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c
浏览文件 @ 1af998b2
...@@ -104,11 +104,10 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain) ...@@ -104,11 +104,10 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain)
int ret, i, j; int ret, i, j;
/* allocate scratch page */ /* allocate scratch page */
etnaviv_domain->base.bad_page_cpu = dma_alloc_coherent( etnaviv_domain->base.bad_page_cpu =
etnaviv_domain->base.dev, dma_alloc_wc(etnaviv_domain->base.dev, SZ_4K,
SZ_4K, &etnaviv_domain->base.bad_page_dma,
&etnaviv_domain->base.bad_page_dma, GFP_KERNEL);
GFP_KERNEL);
if (!etnaviv_domain->base.bad_page_cpu) { if (!etnaviv_domain->base.bad_page_cpu) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_mem; goto fail_mem;
...@@ -117,19 +116,17 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain) ...@@ -117,19 +116,17 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain)
for (i = 0; i < SZ_4K / 4; i++) for (i = 0; i < SZ_4K / 4; i++)
*p++ = 0xdead55aa; *p++ = 0xdead55aa;
etnaviv_domain->pta_cpu = dma_alloc_coherent(etnaviv_domain->base.dev, etnaviv_domain->pta_cpu = dma_alloc_wc(etnaviv_domain->base.dev,
SZ_4K, SZ_4K, &etnaviv_domain->pta_dma,
&etnaviv_domain->pta_dma, GFP_KERNEL);
GFP_KERNEL);
if (!etnaviv_domain->pta_cpu) { if (!etnaviv_domain->pta_cpu) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_mem; goto fail_mem;
} }
etnaviv_domain->mtlb_cpu = dma_alloc_coherent(etnaviv_domain->base.dev, etnaviv_domain->mtlb_cpu = dma_alloc_wc(etnaviv_domain->base.dev,
SZ_4K, SZ_4K, &etnaviv_domain->mtlb_dma,
&etnaviv_domain->mtlb_dma, GFP_KERNEL);
GFP_KERNEL);
if (!etnaviv_domain->mtlb_cpu) { if (!etnaviv_domain->mtlb_cpu) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_mem; goto fail_mem;
...@@ -138,10 +135,9 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain) ...@@ -138,10 +135,9 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain)
/* pre-populate STLB pages (may want to switch to on-demand later) */ /* pre-populate STLB pages (may want to switch to on-demand later) */
for (i = 0; i < MMUv2_MAX_STLB_ENTRIES; i++) { for (i = 0; i < MMUv2_MAX_STLB_ENTRIES; i++) {
etnaviv_domain->stlb_cpu[i] = etnaviv_domain->stlb_cpu[i] =
dma_alloc_coherent(etnaviv_domain->base.dev, dma_alloc_wc(etnaviv_domain->base.dev, SZ_4K,
SZ_4K, &etnaviv_domain->stlb_dma[i],
&etnaviv_domain->stlb_dma[i], GFP_KERNEL);
GFP_KERNEL);
if (!etnaviv_domain->stlb_cpu[i]) { if (!etnaviv_domain->stlb_cpu[i]) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_mem; goto fail_mem;
...@@ -158,25 +154,23 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain) ...@@ -158,25 +154,23 @@ static int etnaviv_iommuv2_init(struct etnaviv_iommuv2_domain *etnaviv_domain)
fail_mem: fail_mem:
if (etnaviv_domain->base.bad_page_cpu) if (etnaviv_domain->base.bad_page_cpu)
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->base.bad_page_cpu, etnaviv_domain->base.bad_page_cpu,
etnaviv_domain->base.bad_page_dma); etnaviv_domain->base.bad_page_dma);
if (etnaviv_domain->pta_cpu) if (etnaviv_domain->pta_cpu)
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->pta_cpu, etnaviv_domain->pta_cpu, etnaviv_domain->pta_dma);
etnaviv_domain->pta_dma);
if (etnaviv_domain->mtlb_cpu) if (etnaviv_domain->mtlb_cpu)
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->mtlb_cpu, etnaviv_domain->mtlb_cpu, etnaviv_domain->mtlb_dma);
etnaviv_domain->mtlb_dma);
for (i = 0; i < MMUv2_MAX_STLB_ENTRIES; i++) { for (i = 0; i < MMUv2_MAX_STLB_ENTRIES; i++) {
if (etnaviv_domain->stlb_cpu[i]) if (etnaviv_domain->stlb_cpu[i])
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->stlb_cpu[i], etnaviv_domain->stlb_cpu[i],
etnaviv_domain->stlb_dma[i]); etnaviv_domain->stlb_dma[i]);
} }
return ret; return ret;
...@@ -188,23 +182,21 @@ static void etnaviv_iommuv2_domain_free(struct etnaviv_iommu_domain *domain) ...@@ -188,23 +182,21 @@ static void etnaviv_iommuv2_domain_free(struct etnaviv_iommu_domain *domain)
to_etnaviv_domain(domain); to_etnaviv_domain(domain);
int i; int i;
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->base.bad_page_cpu, etnaviv_domain->base.bad_page_cpu,
etnaviv_domain->base.bad_page_dma); etnaviv_domain->base.bad_page_dma);
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->pta_cpu, etnaviv_domain->pta_cpu, etnaviv_domain->pta_dma);
etnaviv_domain->pta_dma);
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->mtlb_cpu, etnaviv_domain->mtlb_cpu, etnaviv_domain->mtlb_dma);
etnaviv_domain->mtlb_dma);
for (i = 0; i < MMUv2_MAX_STLB_ENTRIES; i++) { for (i = 0; i < MMUv2_MAX_STLB_ENTRIES; i++) {
if (etnaviv_domain->stlb_cpu[i]) if (etnaviv_domain->stlb_cpu[i])
dma_free_coherent(etnaviv_domain->base.dev, SZ_4K, dma_free_wc(etnaviv_domain->base.dev, SZ_4K,
etnaviv_domain->stlb_cpu[i], etnaviv_domain->stlb_cpu[i],
etnaviv_domain->stlb_dma[i]); etnaviv_domain->stlb_dma[i]);
} }
vfree(etnaviv_domain); vfree(etnaviv_domain);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或