Unverified Commit 334dd38a authored by Phil Elwell's avatar Phil Elwell Committed by Maxime Ripard
Browse files

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: default avatarPhil Elwell <phil@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/1608755714-18233-3-git-send-email-stefan.wahren@i2se.com
parent f4f3beb7

drivers/gpu/drm/v3d/v3d_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) 
		return ret;



	mmu_debug = V3D_READ(V3D_MMU_DEBUG_INFO);

	dev->coherent_dma_mask =

		DMA_BIT_MASK(30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_PA_WIDTH));

	dma_set_mask_and_coherent(dev,

		DMA_BIT_MASK(30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_PA_WIDTH)));

	v3d->va_width = 30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_VA_WIDTH);



	ident1 = V3D_READ(V3D_HUB_IDENT1);