Commit 636757ab authored May 18, 2018 by Ezequiel Garcia Committed by Mauro Carvalho Chehab May 28, 2018

media: tw686x: Fix incorrect vb2_mem_ops GFP flags



When the driver is configured in the "memcpy" dma-mode,
it uses vb2_vmalloc_memops, which is backed by a SLAB
allocator and so shouldn't be using GFP_DMA32.

Fix it.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 9e73d231

drivers/media/pci/tw686x/tw686x-video.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1228,7 +1228,8 @@ int tw686x_video_init(struct tw686x_dev *dev)
		vc->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
		vc->vidq.min_buffers_needed = 2;
		vc->vidq.lock = &vc->vb_mutex;
		vc->vidq.gfp_flags = GFP_DMA32;
		vc->vidq.gfp_flags = dev->dma_mode != TW686X_DMA_MODE_MEMCPY ?
		GFP_DMA32 : 0;
		vc->vidq.dev = &dev->pci_dev->dev;

		err = vb2_queue_init(&vc->vidq);