diff options
| author |   Phil Elwell <phil@raspberrypi.org> | 2020-12-23 21:35:12 +0100 |
|---|---|---|
| committer |   Maxime Ripard <maxime@cerno.tech> | 2021-01-06 18:38:57 +0100 |
| commit | 334dd38a3878a8fba1cfaa3c715163226de3cddc (patch) | |
| tree | 3985c144b224475c2d1137b5865c1c2dfa82ac30 | |
| parent | drm/v3d: Use platform_get_irq_optional() to get optional IRQs (diff) | |
| download | linux-dev-334dd38a3878a8fba1cfaa3c715163226de3cddc.tar.xz linux-dev-334dd38a3878a8fba1cfaa3c715163226de3cddc.zip | |
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 <phil@raspberrypi.org>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/1608755714-18233-3-git-send-email-stefan.wahren@i2se.com
| -rw-r--r-- | drivers/gpu/drm/v3d/v3d_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 42d401fd244e..99e22beea90b 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -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); |