From 75e50217c8c8d9ab8dc84547fd149d9bfe32ae5d Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 22 Nov 2019 16:23:32 +0000 Subject: [PATCH] drm/v3d: Set dma_mask as well as coherent_dma_mask Both coherent_dma_mask and dma_mask act as constraints on allocations and bounce buffer usage, so be sure to set dma_mask to the appropriate value otherwise the effective mask could be incorrect. Signed-off-by: Phil Elwell --- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -261,7 +261,7 @@ static int v3d_platform_drm_probe(struct int ret; u32 ident1; - dev->coherent_dma_mask = DMA_BIT_MASK(36); + dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36)); v3d = kzalloc(sizeof(*v3d), GFP_KERNEL); if (!v3d)