Commit e30b38b7 authored by Qiang Yu's avatar Qiang Yu

drm/lima: add __GFP_NOWARN flag to all dma_alloc_wc

This prevent CMA printing dumy "PFNs busy" info which is
caused by alloc fail re-try case.
Reviewed-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: default avatarQiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191010140152.17747-4-yuq825@gmail.com
parent e305b8b6
...@@ -314,7 +314,7 @@ int lima_device_init(struct lima_device *ldev) ...@@ -314,7 +314,7 @@ int lima_device_init(struct lima_device *ldev)
ldev->va_end = LIMA_VA_RESERVE_START; ldev->va_end = LIMA_VA_RESERVE_START;
ldev->dlbu_cpu = dma_alloc_wc( ldev->dlbu_cpu = dma_alloc_wc(
ldev->dev, LIMA_PAGE_SIZE, ldev->dev, LIMA_PAGE_SIZE,
&ldev->dlbu_dma, GFP_KERNEL); &ldev->dlbu_dma, GFP_KERNEL | __GFP_NOWARN);
if (!ldev->dlbu_cpu) { if (!ldev->dlbu_cpu) {
err = -ENOMEM; err = -ENOMEM;
goto err_out2; goto err_out2;
......
...@@ -56,7 +56,7 @@ static int lima_vm_map_page(struct lima_vm *vm, dma_addr_t pa, u32 va) ...@@ -56,7 +56,7 @@ static int lima_vm_map_page(struct lima_vm *vm, dma_addr_t pa, u32 va)
vm->bts[pbe].cpu = dma_alloc_wc( vm->bts[pbe].cpu = dma_alloc_wc(
vm->dev->dev, LIMA_PAGE_SIZE << LIMA_VM_NUM_PT_PER_BT_SHIFT, vm->dev->dev, LIMA_PAGE_SIZE << LIMA_VM_NUM_PT_PER_BT_SHIFT,
&vm->bts[pbe].dma, GFP_KERNEL | __GFP_ZERO); &vm->bts[pbe].dma, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);
if (!vm->bts[pbe].cpu) if (!vm->bts[pbe].cpu)
return -ENOMEM; return -ENOMEM;
...@@ -208,7 +208,7 @@ struct lima_vm *lima_vm_create(struct lima_device *dev) ...@@ -208,7 +208,7 @@ struct lima_vm *lima_vm_create(struct lima_device *dev)
kref_init(&vm->refcount); kref_init(&vm->refcount);
vm->pd.cpu = dma_alloc_wc(dev->dev, LIMA_PAGE_SIZE, &vm->pd.dma, vm->pd.cpu = dma_alloc_wc(dev->dev, LIMA_PAGE_SIZE, &vm->pd.dma,
GFP_KERNEL | __GFP_ZERO); GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);
if (!vm->pd.cpu) if (!vm->pd.cpu)
goto err_out0; goto err_out0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment