mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 16:12:59 +02:00
drm/etnaviv: Request pages from DMA32 zone on addressing_limited
Remove __GFP_HIGHMEM when requesting a page from DMA32 zone,
and since all vivante GPUs in the system will share the same
DMA constraints, move the check of whether to get a page from
DMA32 to etnaviv_bind().
Fixes: b72af445cd ("drm/etnaviv: request pages from DMA32 zone when needed")
Suggested-by: Sui Jingfeng <sui.jingfeng@linux.dev>
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
This commit is contained in:
parent
9852d85ec9
commit
13c96ac9a3
|
|
@ -538,6 +538,16 @@ static int etnaviv_bind(struct device *dev)
|
|||
priv->num_gpus = 0;
|
||||
priv->shm_gfp_mask = GFP_HIGHUSER | __GFP_RETRY_MAYFAIL | __GFP_NOWARN;
|
||||
|
||||
/*
|
||||
* If the GPU is part of a system with DMA addressing limitations,
|
||||
* request pages for our SHM backend buffers from the DMA32 zone to
|
||||
* hopefully avoid performance killing SWIOTLB bounce buffering.
|
||||
*/
|
||||
if (dma_addressing_limited(dev)) {
|
||||
priv->shm_gfp_mask |= GFP_DMA32;
|
||||
priv->shm_gfp_mask &= ~__GFP_HIGHMEM;
|
||||
}
|
||||
|
||||
priv->cmdbuf_suballoc = etnaviv_cmdbuf_suballoc_new(drm->dev);
|
||||
if (IS_ERR(priv->cmdbuf_suballoc)) {
|
||||
dev_err(drm->dev, "Failed to create cmdbuf suballocator\n");
|
||||
|
|
|
|||
|
|
@ -839,14 +839,6 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
|
|||
if (ret)
|
||||
goto fail;
|
||||
|
||||
/*
|
||||
* If the GPU is part of a system with DMA addressing limitations,
|
||||
* request pages for our SHM backend buffers from the DMA32 zone to
|
||||
* hopefully avoid performance killing SWIOTLB bounce buffering.
|
||||
*/
|
||||
if (dma_addressing_limited(gpu->dev))
|
||||
priv->shm_gfp_mask |= GFP_DMA32;
|
||||
|
||||
/* Create buffer: */
|
||||
ret = etnaviv_cmdbuf_init(priv->cmdbuf_suballoc, &gpu->buffer,
|
||||
PAGE_SIZE);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user