Commit e30b38b7 authored by Qiang Yu's avatar Qiang Yu
Browse files

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

drivers/gpu/drm/lima/lima_device.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ int lima_device_init(struct lima_device *ldev) 
		ldev->va_end = LIMA_VA_RESERVE_START;

		ldev->dlbu_cpu = dma_alloc_wc(

			ldev->dev, LIMA_PAGE_SIZE,

			&ldev->dlbu_dma, GFP_KERNEL);

			&ldev->dlbu_dma, GFP_KERNEL | __GFP_NOWARN);

		if (!ldev->dlbu_cpu) {

			err = -ENOMEM;

			goto err_out2;

drivers/gpu/drm/lima/lima_vm.c

+2 −2
Original line number Diff line number Diff line
@@ -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->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)

			return -ENOMEM;
@@ -208,7 +208,7 @@ struct lima_vm *lima_vm_create(struct lima_device *dev) 
	kref_init(&vm->refcount);



	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)

		goto err_out0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE