Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9912b4db authored by Lucas Stach's avatar Lucas Stach
Browse files

drm/etnaviv: get cmdbuf physical address through the cmdbuf abstraction 



Don't allow IOMMUv2 to peek directly into the cmdbuf, but get the
needed PA through a dedicated function.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Reviewed-by: default avatarChristian Gmeiner <christian.gmeiner@gmail.com>
parent c3ef4b8c

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c

+5 −0
Original line number Diff line number Diff line
@@ -57,3 +57,8 @@ u32 etnaviv_cmdbuf_get_va(struct etnaviv_cmdbuf *buf) 
{

	return etnaviv_iommu_get_cmdbuf_va(buf->gpu, buf);

}



dma_addr_t etnaviv_cmdbuf_get_pa(struct etnaviv_cmdbuf *buf)

{

	return buf->paddr;

}

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h

+1 −0
Original line number Diff line number Diff line
@@ -44,5 +44,6 @@ struct etnaviv_cmdbuf { 
};



u32 etnaviv_cmdbuf_get_va(struct etnaviv_cmdbuf *buf);

dma_addr_t etnaviv_cmdbuf_get_pa(struct etnaviv_cmdbuf *buf);



#endif /* __ETNAVIV_CMDBUF_H__ */

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ static void etnaviv_buffer_dump(struct etnaviv_gpu *gpu, struct seq_file *m) 
	u32 i;



	seq_printf(m, "virt %p - phys 0x%llx - free 0x%08x\n",

			buf->vaddr, (u64)buf->paddr, size - buf->user_size);

			buf->vaddr, (u64)etnaviv_cmdbuf_get_pa(buf),

			size - buf->user_size);



	for (i = 0; i < size / 4; i++) {

		if (i && !(i % 4))

drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ void etnaviv_iommuv2_restore(struct etnaviv_gpu *gpu) 
	prefetch = etnaviv_buffer_config_mmuv2(gpu,

				(u32)etnaviv_domain->mtlb_dma,

				(u32)etnaviv_domain->bad_page_dma);

	etnaviv_gpu_start_fe(gpu, gpu->buffer->paddr, prefetch);

	etnaviv_gpu_start_fe(gpu, (u32)etnaviv_cmdbuf_get_pa(gpu->buffer),

			     prefetch);

	etnaviv_gpu_wait_idle(gpu, 100);



	gpu_write(gpu, VIVS_MMUv2_CONTROL, VIVS_MMUv2_CONTROL_ENABLE);